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

Change-Id: I0a1d021e800cd4a2eda41324a3b53a379c8581a8