Merge stage-aosp-master to aosp-master - DO NOT MERGE

Change-Id: I0d084c5fa12268b2cc15e3ea6b2e896f8167cc6c