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

Change-Id: Ic2cbd74b2e7e4270d02fde954ede82c7499145bf