NXP-10872: Fix 'default comes last' Sonar error