NXP-11113: Fix Sonar violations