NXP-15391 align on HF23 SNAP