Merge "Revert "Add google-owned SMS short codes for Namibia, United Arab Emirates"" into main