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

Change-Id: Id5ade2438e3a4716ca4ac69fa11438169dd2e763