Merge "Support X509TrustManagerExtensions methods"