[OCD] Don't add the "test-keys" text after Build ID