Merge "Merge stage-aosp-master to aosp-master - DO NOT MERGE" am: 8ccc0d9973 am: 111c59d707

Change-Id: Ied0d6d5e972de90329047ba45a5ebdbe1088a749