Merge "Prepare for removal of legacy-test from default targets" am: a7094d8e am: 4ffb04dd am: 5ad3c04d am: d166148a Change-Id: I251673fa685efcb91b7c0159ff6172faade2dc98