Merge "Prepare for removal of legacy-test from default targets" am: 2d529342e0
am: 8b1487e88d

Change-Id: Ied39ab791df33349bb4800b68569b9f7df452da3