Resolve conflicts resulting from subtree pull of ob_base upstream