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

Change-Id: I6b1c348bf0a82a6c100e3862f5e47b8e8805a99c