Merge "Prepare for removal of legacy-test from default targets" am: 794a36fcb5 am: 59aa290a93 am: 6ac6a41207
am: b9ab158a5e

Change-Id: If3e43c4e733bad0e4da344626c28eba2c1b2b6c5