Merge stage-aosp-master to aosp-master - DO NOT MERGE am: 6b8bf72c06 am: 4ff23092ea

Change-Id: Iab4cd7315eca75119e2331def14eb2dc7aca6452