Merge "Prepare for removal of legacy-test from default targets" am: 2d529342e0 am: 8b1487e88d am: 880d73a4b4
am: 2031827b14  -s ours

Change-Id: I0c008c6dda2340f78438ce3bbb064f9f58b00cbb