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

Change-Id: I4c4c89b4c967bb2c749c387272dc0e486f50ae15