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

Change-Id: I28260538445d0b218ae629bf245f2067beef1263