Merge "Fix ECDHE-PSK premaster secret derivation."