Merge "Start handshake before calling hostname verifier" into mnc-dev