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

Change-Id: Ieb788dc147a2770cf2d16f9b4b4ff5b1ff7bf8aa