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

Change-Id: I981fa64f2c744afc31502e29df041c091bf98545