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

Change-Id: Ia8304a03a78467b7965951b175adaf663c072ad7