Rebase 10.0 patches onto 70.0.16

Edited by Matthew Finkel