Merge "[OOM-CERT-SERVICE] Align implementation with RFC4210"