Fix nested parcelable class name am: d17c58babb am: e667674402
am: 7bc7be846b

Change-Id: I562f2f768ac4bda00ddf1d363b2dc5e7463fa0de