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

Change-Id: I34f888bd76c4f894d3ee6582c30508d5ba9ee563