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

Change-Id: I231859f9e26c99ae3a34241842e50f4d44d23f93