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

Change-Id: I37899146748f8d4d9bb0660545304402cbd1f5ed