Merge "Prepare for removal of legacy-test from default targets"
am: 524cce0089

Change-Id: I3345eaf0c2d4c7cdfcf46258919cc450252e7bc7