Merge "Rewrite BufferHubBuffer_test to avoid test crash"