Merge "Refine the binder latency test" into oc-dev