Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
am: 035e55d185

Change-Id: I817eda9a2da3054cae9c9b455d4097e9589ca01b