NXP-12290 fix sonar violations