am 3af56629: Merge "Improve tests for TLS fallback."

* commit '3af56629930e754e8b80c6964da1d9de83510b9e':
  Improve tests for TLS fallback.