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

Change-Id: I5a0569c239e05384059ff458b4bdab0b6d228aa4