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

Change-Id: I2da7085b5c1f235c7d50949b1abd26ae2aea6888