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

Change-Id: I918ea93e45109856d300d2f0e0217a093ddfbafd