chore: [32-x-y] cherry-pick 1 changes from 0-M131 * 923797bac925 from chromium Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>