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

Change-Id: Ia07fdf340d3af9833f9631c006019339245c2a82