Merge "Make rest-perf-client modify the {DEVICE_PORT} tag in payloads"