Merge "Fix BufferHubBufferTest test crash"