Merge "Adds a private field to parceled data." into pi-dev am: 63a6bc6794
am: 5e5e0760de

Change-Id: I1fd79faf4e7a584cdb518e9fa05e98b5870eb2ab