Merge "Do not use hidden API ParcelableException" am: c1faf5b1e4
am: dcb1f5894c

Change-Id: I1d20c835876570a2b219635ae7152f8d475469b4