Revert "NXP-15755: Temporary alignment on 5.9.6-I20141027_2013"

This reverts commit db2f9a9d3e61c5f4643c140052dc05b883862e3a.