NXP-15755: Temporary alignment on 5.9.6-I20141027_2013