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

Change-Id: I53619bae55db81496ce22acba364c5e603944168