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

Change-Id: I5064b50fd8afd89af41b7410e9e72ee8240ed165