NXP-12847: fix Sonar violations
NXP-12847: one more place to fix Year replacement