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

Change-Id: I79c21859aa657b7a61e5cc8e7d60f79f736f34be