Merge "Fix raw reference to SessionNegotiatior"