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

Change-Id: I4e6248df3d1f3ec26125dd2b4560667a5ab76cd7