[Finishes #10685] Chrome commit