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

Change-Id: Ia94495861c5070d2681b5190cb3a918981b0fc6d