NXP-11686: Fix Sonar Violations