Merge "Prepare for removal of legacy-test from default targets" am: 794a36fcb5
am: 59aa290a93

Change-Id: I6e386e587555c398f98510f5b03d0d6984ae9a58