Merge "Update BufferHubQueueProducer"