Prepare for removal of legacy-test from default targets am: 778f3beafa am: d0e50690e7 am: 547a1be7a5
am: 5a9916bfd3

Change-Id: Ib1f328798a8864f356a97b091cae0c5e963e3536