Merge "Prepare for removal of legacy-test from default targets" am: a691d6c012 am: 1fc636d62b
am: 488ffd1db1

Change-Id: I5677f7023129dcacba6babe73e6b047e27f879b3