Merge "Don't use X509CertImpl directly"