Merge "Prepare for removal of legacy-test from default targets (Part 2)"
am: 5a3a3d298a

Change-Id: I14fd4502454a98baf01f5ace83fe0c583005a52d