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

Change-Id: I020ac951cc59af87b5c8b17297793f04aa6e11df