Prepare for removal of legacy-test from default targets am: 99eceb05e7
am: 6ae20b7326

Change-Id: I5bbbc119fd787f959b47b9f3ad63c607c030b0fb