Merge "Remove usage of hidden Parcel APIs"