Merge "Fix bufferhubd crash in buffer_hub-test"