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

Change-Id: Iabde54e4c384090fbb297d93f0ac1bc8e428f2c2