Merge "Remove testTokenize" am: 52c5601801

Change-Id: I9a4b23eef55735801768c750d24b3cee5dd79501