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

Change-Id: I38a40108f3138283535bfc992fc0b98ab8dca841