NXP-12002: Fix unit test
Merge branch 'master' into 5.6.0