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

Change-Id: I05173764ce543ae76e68a17c1f7d24be7ccfa87b