NXP-12703: Align package on 5.8-SNAPSHOT