DO NOT MERGE: Remove parcelable declaration from the source list am: 78fa3d96ff

Change-Id: Ib658fcc08430aed7cd45576e0c50f5589952cfcd