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

Change-Id: Idd6b729dc40062d85000752c4d0367ee157503f5