[automerger skipped] [automerger] Disallow reading object data from Parcels...

[automerger skipped] [automerger] Disallow reading object data from Parcels with non-object reads am: f784183c am: c6ae5cf9 am: 22b59509 am: f4dc4cd4 am: 81a160b1 am: 2d14de5c am: 9f922212 am: 2de1de14 skipped: e6373f11 am: 2944d598  -s ours
am: 48e490bb  -s ours

Change-Id: Ib587b76745a36017ed21b3fa8beb9d94ff6f87d9