Prepare for removal of legacy-test from default targets am: 606e0864 am: 18f831e1 am: 13b8cc80 am: d4f1ba57 -s ours Change-Id: Id5834abe1d2edbf1349ba8f4ef560012d589a347