Merge "Fix BufferHubMetadata_test build on oc branch"