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

Change-Id: Iaefb0e76ae3552d712abe4307a53b6e1b6ec5026