Merge "Prepare for removal of legacy-test from default targets" am: e771ade10d
am: 013c7a6515

Change-Id: I5185a8f2ec2bfd17b79d3ef170dc3078d843e90a