Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD am: 4d269c7593
am: 1c98bd15ca

Change-Id: I04d7d35ff2d02cc9244c8fc5f1bb4e297064c97f