[automerger skipped] Merge "Adds a private field to parceled data." am: 7db23752ab
am: 1ff8f364d4  -s ours

Change-Id: Ia4112ec02579389e4fa02fabe7de493ee087124b