Merge "Prepare for removal of legacy-test from default targets" am: a6b0c881fd am: a3da659863
am: cf967da02a

Change-Id: Ifc88129c31c074674f42ee356382dd6aa5022952