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

Change-Id: I668506f8d0c4e9d6a2d2d860ba2d44376f04d077