Merge "[OOM-CERT-SERVICE] Refactor CmpResponseValidationHelper"