Merge "Fix mismatch in parcel read/write in ParcelableCasData -- DO NOT MERGE" into oc-dev
am: 5d2153d17c

Change-Id: I04e026a96e1899ba9496979561df5680297f546a