Fixed running in Dartium w/o build step

Integrated CL suggestions