Merge "Test object after a Parcel shrink" into oc-dev am: 53d6628e06 am: b439c8edb5 am: 4b2f28c4b9

Change-Id: Ieb8270fbd4ce41a5c82a387591832658cf2aa747