Merge "Prepare for removal of legacy-test from default targets"
am: 5644a6ec76

Change-Id: Iff3720214e22747498537162871b5ca2f37bbaa7