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

Change-Id: Iebb76d142bc1366cf466be5eec5c9c70d73716d7