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

Change-Id: I4d9447b26cabf302e8de8adfc1e670bcf4114e35