Merge "Parcel compRequired flag correctly."