Merge "Adds a private field to parceled data."
am: 7db23752ab

Change-Id: I9d0bde31a8aeb67b62e202b3b8946b066b81d186