Merge "Use proper classloader when reading from parcel" am: d3cb6380a4
am: 03a515aed4

Change-Id: I65070de075e8d09512d771c805c82043f04b3275