Merge "Correct Parcel value types"