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

Change-Id: Id14bd19f7d1799dc1989f04fc00d0dd9fad07c85