This bug is in response to: https://bugs.chromium.org/p/chromium/issues/detail?id=685334#c6

We've tried this before ( issue 372419 ). Also note that this will likely cause some confusion in the buildbot interpretation of builds *while this is going through the pre-cq and cq*, because the new steps will come into effect partially through the build (this has also happened before)

I hit a snag with the CL, and seem to have actually abandoned the CL since.
I no longer have context, and this will get demoted unless someone pushes back.