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

Change-Id: Ied056ff65724c08a5fb7923e3258060a89059a08