Merge "[OOM-CERT-SERVICE] Add CertificateDecriptionException handler"