Merge "Prepare for removal of legacy-test from default targets" am: a7094d8ed1
am: 4ffb04dd9d

Change-Id: Ibe47b6007ac1bc1c798bb1a813f28bab10d637f5