Prepare for removal of legacy-test from default targets am: 85d64f51c5 am: 845263139f
am: f35417c4ea

Change-Id: I5cc61cbf428fa3495d9e8dc8729bdb982ec6814c