[Lts-dev] Getting to a clean baseline with mainline