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

Change-Id: I2033cc7a00d156a184a0415711e656bf6a49ea81