Merge "Prepare for removal of legacy-test from default targets" am: 5644a6ec76
am: 63c6f8bcb4

Change-Id: Ic3283992689de0d8edb59fd7f331833bfdcb0c2e