NXP-15160 fixing dependencies