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

Change-Id: Ifd6c30474342b1ecaf817021c96b4eab549fe57a