Merge "Reduce buffer_hub-test flakiness"