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

Change-Id: I0d716e7eca77ccf0c637c970242365f3512ee6ec