Merge changes from topic "AParcel_fromJavaParcel" am: 08c5dfcdd1 am: 8fb7dd9600

Change-Id: Ic22254be07e54f7e6747a5aa667088b33210b501