Merge "Parcel: remove two undefined functions"