Merge "Prepare for removal of legacy-test from default targets" am: 794a36fcb5 am: 59aa290a93
am: 6ac6a41207

Change-Id: I62ebcd99b981b16da54f9c1e7d60b3a04ca63861