Merge "Prepare for removal of legacy-test from default targets"
am: a6b0c881fd

Change-Id: Iadb65fd5a2630e74071866f2d0b4347d29a71af1