Merge "Remove direct reference to X509CertImpl"