Merge "Frameworks: Slightly refactor Parcel code" am: 9d519d808f am: 308b11e264
am: 2d651ebe25

Change-Id: Ia9fccc108524bfe24eac7025431e249c892b6cfd