Merge "Prepare for removal of legacy-test from default targets"
am: 1b0267d126

Change-Id: I1526126d4a1921fecb88cee432158c1faa25000d