Merge "Prepare for removal of legacy-test from default targets" am: 6946d8aae5
am: e7cfbd5cf6

Change-Id: I3f06ff492f15894b8485593a51a8582f5cbb0286