Merge "Fix TLS-PSK identity hint implementation issues."