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

Change-Id: I1da326b289b7d4b6fcbe18630f0ff729fa875af2