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

Change-Id: I1193b5595fc7b64fe9c645606c283c604de11820