Merge "Fix minor corner cases in BufferHubQueueProducer" into oc-dev am: 03d95980a1
am: 398519f96c

Change-Id: I34f615088f4a9b173269fae49cdc477e824c817a