Merge "Prepare for removal of legacy-test from default targets"
am: 6946d8aae5

Change-Id: Iad4f18e7457becc3a6f8705669ea91ffa9ab7628