Merge "Fix reading exception from Parcel" into pi-dev am: e269a5ac62
am: 30f3e957d3

Change-Id: If2d51fee0cb1d84738798c804761233b7004d385