Bug 840790 - [B2G][First Time User]Wrong or Modified names for various locations
Merge pull request #25291 from anrao91/840790

Bug 840790 - [B2G][First Time User]Wrong or Modified names for various locations