Merge "Do not parcel legacy TextClassification fields" into pi-dev