Merge "Prepare for removal of legacy-test from default targets" am: c74ccf1588 am: ab62fd67d8 am: 56a2ae1056
am: 43267b4b9e  -s ours

Change-Id: I6d18e3a061a446865d367a3cd2053285ca702ded