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

Change-Id: I06d0cff77e560c59343c664a9ca0a0bafe6a9105