Prepare for removal of legacy-test from default targets am: 99eceb05e7 am: 6ae20b7326
am: 6cc3c24f17

Change-Id: I1f9a4534b9c942e8ee7035906832fbb6d4309adc