Merge "Avoid using new/delete in locale.cpp"