Merge "Adds a private field to parceled data." into pi-dev