Merge "BufferHubQueue Cleanup" into oc-dev
am: bb5767763a

Change-Id: I44b9156d5cbb23a26ebe57744e5a524d5dc93ea8