Merge "Check for null hostnames in RootTrustManager" am: 49ce7dc2ba
am: 15ea45c848

* commit '15ea45c848fbf9e70bbfe6afbfb25d39ce406c80':
  Check for null hostnames in RootTrustManager