Merge "[OOM-CERT-SERVICE] Refactor CertService API code"