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

Change-Id: I15e253f276b621994880de10fe1b0d01f16a0c30