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

Change-Id: Id7006a3071f61060bb612c01b3384bfcb5df7a85