Revert unintended changes.

Author: kannanjgithub

examples/example-tls/src/main/java/io/grpc/examples/helloworldtls/HelloWorldClientTls.java

@@ -18,7 +18,6 @@
 
 import io.grpc.Channel;
 import io.grpc.Grpc;
-import io.grpc.okhttp.OkHttpChannelBuilder;
 import io.grpc.ManagedChannel;
 import io.grpc.StatusRuntimeException;
 import io.grpc.TlsChannelCredentials;

okhttp/src/main/java/io/grpc/okhttp/OkHttpClientTransport.java

@@ -472,7 +472,7 @@ public ClientStream newStream(
           peerVerificationStatus = Status.OK;
         } catch (SSLPeerUnverifiedException | CertificateException e) {
           peerVerificationStatus = Status.UNAVAILABLE.withDescription(
-                  String.format("Failure in verifying authority '%s' against peer",
+                  String.format("Failure in verifying authority '%s' against peer during rpc",
                           callOptions.getAuthority())).withCause(e);
         }
         peerVerificationResults.put(callOptions.getAuthority(), peerVerificationStatus);

okhttp/src/test/java/io/grpc/okhttp/TlsTest.java

@@ -156,7 +156,7 @@ public void perRpcAuthorityOverride_doesntMatchCertNames_fails() throws Exceptio
     } catch (StatusRuntimeException ex) {
       assertThat(ex.getStatus().getCode()).isEqualTo(Status.Code.UNAVAILABLE);
       assertThat(ex.getStatus().getDescription()).isEqualTo(
-              "Failure in verifying authority 'foo.test.google.in' against peer");
+              "Failure in verifying authority 'foo.test.google.in' against peer during rpc");
       assertThat(ex.getStatus().getCause()).isInstanceOf(CertificateException.class);
       assertThat(ex.getStatus().getCause().getMessage()).isEqualTo(
               "No subject alternative DNS name matching foo.test.google.in found.");