Prepare for removal of legacy-test from default targets am: bce5cb3248 am: dbb3cd4162
am: 9e3bee350a

Change-Id: I50754401a412ee5c99f459ff7c399f6534e232f9