Rebased queue to mozilla-inbound c8387e2ab335