Merge branch 'temp_72223856' of persistent-https://android.git.corp.google.com/platform/external/libtextclassifier into merge1
am: d16be73edc

Change-Id: I7140a4e9e7218c21370c2ab8b5b8227445f63222