Merge "Fixing method asymmetry in Parcel"