am 4f3ac4e5: Merge "Fix TLS-PSK identity hint implementation issues."

* commit '4f3ac4e5bd87c4aae70348b7d8ccd34ccdc5efea':
  Fix TLS-PSK identity hint implementation issues.