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

Change-Id: I94fcdd95e26361328411ea71c02f6baadeac230d