Remove usage of hidden Parcel APIs am: 2f45d6dcc0 am: bd73ba1b81

Change-Id: Ie74519ff850c87e39689f7037f2198c92b6482af