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

Change-Id: I5e2c5e444f428087d29b0d633853cf3c4a8ce528