Merge "Prepare for removal of legacy-test from default targets" am: 96360a5935
am: 043c5d763b

Change-Id: I770ed88d7e07414d83dbff831f75104d901e2a6c