Merge "Prepare for removal of legacy-test from default targets (Part 2)" am: 5a3a3d298a am: a07f9d522b am: 5aa7e5b46f
am: 762b31f7a4  -s ours

Change-Id: I706c89818b7b27c674e6f5d2d987128269fb6bd6