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

Change-Id: I77d1f458a589152af8cf506a703db3ab794f2881