Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
am: 2575160d88

Change-Id: I25daf10324f16b5fe4ea4377e403f34ddc8023ad