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

Change-Id: I36454e28cefb2aef158abb4909668562a76b2bd4