Merge remote-tracking branch 'goog/master-chromium' into 'goog/master'

bug: 6906025
Change-Id: Ica9524b017abb6124f6cd0e11fd36c64f2cee68a