Merge "BufferHubQueue Cleanup" into oc-dev am: bb5767763a
am: 2556995957  -s ours

Change-Id: I111dd0e3c3846986ee731c0e228190f425ada357