am d152f7ec: Merge "Don\'t use X509CertImpl directly"

* commit 'd152f7ec1ae43d77ff8e2206724ce71da3da9913':
  Don't use X509CertImpl directly