Merge "Prepare for removal of legacy-test from default targets" am: faab13c7 am: f9477e78 am: 3a628f8a am: 50740ce8 Change-Id: I6f5b1e0d06af66a5ee6bdaed8a75ced3e742d44e