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

Change-Id: Iaffcbc521d753ecc23d9973beb4b9433d4251df9