Fix location strings to match Android standards

h/t maxme

fixes #1524
Merge pull request #1539 from mjangda/issue/1524-fix-location-strings

Fix location strings to match Android standards