am 16aa839b: (-s ours) am 0422b9ab: Fix initialization races in X509CertImpl DO NOT MERGE

* commit '16aa839bddaea6f9fdffd4318ae2d2f4e3ba9fba':
  Fix initialization races in X509CertImpl DO NOT MERGE