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

Change-Id: Ia88ee4bf415e16ce46ba78d5ac33de0ab8c19752