Merge "Prepare for removal of legacy-test from default targets" am: ec6226a6e6
am: 1655131ad9

Change-Id: I5fe81af1e98b43ea784111be46f6efa7ef598764