Merge "Prepare for removal of legacy-test from default targets" am: 9c76321f9a am: 23650b2a78
am: b584e2fa9f

Change-Id: I387e39a10c2021a5d43fc88398495f8ced0e6fe2