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