NXP-12920 fix sonar violation