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

Change-Id: I21b4583f5e37df9e495e42eb2a94646fe72f595f