NXP-11840 - remove bad import, fix border cases