Merge "Start handshake before calling hostname verifier"