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

Change-Id: I3c4ee53e8f1e96f58034ac89e7f4bb65dd549120