Merge "Include the API level 4 fields in the Parcel."