Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD

Change-Id: Ie36146262612142a3c456ca915097fb4622c3fdc