Merge "Prepare for removal of legacy-test from default targets" am: 1b0267d126 am: 0d02d1fa1e am: e54dc68df6
am: 6bdd424cc3

Change-Id: I5e9f2d81761864c7fd2cadbe6be63a9ca89dacc5