[automerger skipped] Merge "Adds a private field to parceled data." am: 7db23752ab am: 1ff8f364d4 -s ours
am: 741d43b7bb -s ours
Change-Id: I142acf18a381fec5a5af7fba8b4fb6ee85c789aa
This commit is contained in: