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

Change-Id: I40c65d95c2b03213aac25b2d7e493ad128ccf3ad