Merge "Prepare for removal of legacy-test from default targets (Part 2)"