Merge "Remove testTokenize" am: 52c5601801 am: f6a2f14eb6 am: 618fa08c1c

Change-Id: I684021ba09e18ba88900953e362231b93ab9aadb