Merge "Prepare for removal of legacy-test from default targets" am: 777c5a3ea1 am: 2d7a0786b5 am: 42f777bbb6 -s ours
am: 3a504e398d -s ours
Change-Id: Ifc6b84aa908ee3475713a46cdb3d0dc9ea85e52b
This commit is contained in: