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

Change-Id: If26ed656c31cdf84b758aff0f3239b09973d09dc