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

Change-Id: Ia4700d6642192bf0dea5481ac4787b0fb0b8e234