Merge "Frameworks: Slightly refactor Parcel code"
am: 9d519d808f

Change-Id: Ib02044d8823e3663461ec1387d2b454788771648