Merge "Use X509ExtendedTrustManagers" into nyc-dev