Include script error fix in s32 branch.