Merge "Prepare for removal of legacy-test from default targets (Part 2)" am: 5a3a3d29 am: a07f9d52 am: 5aa7e5b4 Change-Id: I6aede1f1e2216233493cebe3efba43686aa3ad0d