cherry-pick_3_arabic_stch_fixes_to_m138_branch.patch
