Merge "Prepare for removal of legacy-test from default targets" am: 382bc45b8f am: 90b8532341
am: 01a7c93fd0

Change-Id: If04330753c5c354d2c140b9d2fecf08dd119bb55