MOBILE-933 : Localization