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

Change-Id: I2f0a294c716364f3d8396f81ef30dd5765715978