NXP-11551: simplify security