Merge "Do not use hidden API ParcelableException"