Merge "Do not use hidden API ParcelableException" am: e777c27788
am: b35b54f79b

Change-Id: Ia27e89c82d066da902ba3750b866ac69000013c4