NXP-14367: Format
NXP-14367: fixup check order, again
NXP-14367: Format