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

Change-Id: I7334a7d4f7e14bcae80302156ac9123c8fbe2485