am 7c76b86e: am b92bbfcd: Merge "CertificateTest Update" into klp-dev

* commit '7c76b86ea8ae5c38b3f7608bd10c4c41d02924d4':
  CertificateTest Update