Merge "Do not parcel legacy TextClassification fields" into pi-dev am: 6db14d01c2
am: 164183125c

Change-Id: I2a7b4323e815f5a4868085be69e417439729ff90