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

Change-Id: If133d966e765434c963daa70b5b5ce299675d67b