Prepare for removal of legacy-test from default targets
am: 93c58310b0

Change-Id: Ifc1962cff48d930c3325a0d3aa94da1c8b02f9e8