am 2d9b3186: Merge "Fix CertificateFactoryTest API to BC"

* commit '2d9b318685f4a253bb64268569a39fbb117399cd':
  Fix CertificateFactoryTest API to BC