Merge "Prepare for removal of legacy-test from default targets"
am: a7094d8e Change-Id: I05173764ce543ae76e68a17c1f7d24be7ccfa87b
Loading
am: a7094d8e Change-Id: I05173764ce543ae76e68a17c1f7d24be7ccfa87b
mentioned in commit 5ad3c04d
mentioned in commit d166148a
mentioned in commit e9ca8e83