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

Change-Id: I46fe648ce4bd015b1ffff8d5a001d33311d2363b