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

Change-Id: I9721b458ebbf68e95d20e2f8af4c063f8b2936af