Merge "Prepare for removal of legacy-test from default targets" am: e771ade10d am: 013c7a6515 am: 850c264611
am: 46c53fdac6  -s ours

Change-Id: Iadf5f905402f732a0e8af177f686f226f02a6186