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

Change-Id: I41fc890f4a9824089aad1979366c989954b0d66f