Merge "[OOM-CERT-SERVICE] Fix vulnerabilities for Kohn"