Merge "BufferHubQueueProducer reset buffers on disconnect" into oc-mr1-dev
am: 717c106999

Change-Id: If2e19a2c15dda0eb20f94f9d2b446e5839b7d9d6