[automerger skipped] Merge stage-aosp-master to aosp-master - DO NOT MERGE am: 4aa3dcb2b9 am: 1762f1b41b -s ours am: 3b8bfa4082 am: 1acdb610b9

Change-Id: Ie7b053a43b959389a7d67a434c34d674a11ea9ec