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

Change-Id: I02a00b92016ca3ea20c8ee06a8d6fc5b7c95f2b8