NXP-15912: Align back on 6.0-HF01-SNAPSHOT