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

Change-Id: I8db08f5e5a04563f86a71600f34bb5f06267d0c8