NXP-13526: Compile for 5.9.3 compliance
NXP-13526: Compile for 5.9.3 compliance