Fix nested parcelable class name am: d17c58babb
am: e667674402

Change-Id: Iae9e6833f7f12385215ff22101406549bf4fd11d