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

bug: 6906025