Merge "Fix a flaky test in buffer_hub-test"