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

Change-Id: Iaf54870df356ac983933b842966a9ac0076a0004