Merge stage-aosp-master to aosp-master - DO NOT MERGE am: 4aa3dcb2b9

Change-Id: Icb8562520450758301c6bab60f2553fdcb9d578b