Prepare for removal of legacy-test from default targets am: 1c656b29b5
am: eb74e35e10

Change-Id: Idbfe1d246a59d7a2bcf6f2f7ce411d8759fe1e3f