Merge "Prepare for removal of legacy-test from default targets" am: 3c371ed8e4
am: 4199fe0d9c

Change-Id: Ib0d8a55ba985937ab1a7a6f1cdf9d079697b815e