Merge "Harden BufferHubQueueProducerTest" into oc-dev