Merge "Harden BufferHubQueueProducerTest" into oc-dev
am: 8e5deb6b96

Change-Id: If03751b511b12e043aee734b8b7b401a7dd378d4