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

Change-Id: I70154fe27c03d4f1994f6fecd1c02c82bd03fe77