Merge changes from topic "AParcel_fromJavaParcel"
am: 08c5dfcdd1

Change-Id: I4bfa8ff735bc1b794c8cbc44ce9cbc5726a34601