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

Change-Id: Ibbe4d0e9da28f3bc79a54e37076206e1d7c77804