Merge "Prepare for removal of legacy-test from default targets"
am: e771ade10d

Change-Id: If4dced8d6f31843b676c492872ca94948f513011