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

Change-Id: I5a2d5b914f2b2ba36b84ce1a69339ba80de0c872