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

Change-Id: I8902948bc2a4c363269f9b59e15a5c2508a3b340