diff --git a/android/src/com/mapswithme/maps/sound/TTSPlayer.java b/android/src/com/mapswithme/maps/sound/TTSPlayer.java
index f1a9ab3c6b..7438af0f7c 100644
--- a/android/src/com/mapswithme/maps/sound/TTSPlayer.java
+++ b/android/src/com/mapswithme/maps/sound/TTSPlayer.java
@@ -65,7 +65,7 @@ public class TTSPlayer
 
     final Locale loc = getLocale();
     if (loc != null)
-      ;// Call native method to set locale for TTS (loc.getLanguage())
+      nativeSetTurnNotificationsLocale(loc.getLanguage());
   }
 
   private Locale getLocale()
@@ -103,15 +103,8 @@ public class TTSPlayer
     nativeEnableTurnNotifications(enabled);
   }
 
-  public void setLengthUnits(int units)
-  {
-    // Call native method to set units for TTS
-  }
-
   public native static void nativeEnableTurnNotifications(boolean enable);
   public native static boolean nativeAreTurnNotificationsEnabled();
   public native static void nativeSetTurnNotificationsLocale(String locale);
   public native static String nativeGetTurnNotificationsLocale();
-  public native static void nativeSetTurnNotificationsUnits(int lengthUnits);
-  public native static int nativeGetTurnNotificationsUnits();
 }
diff --git a/map/framework.cpp b/map/framework.cpp
index b865277175..8d1558280b 100644
--- a/map/framework.cpp
+++ b/map/framework.cpp
@@ -1616,6 +1616,13 @@ MapStyle Framework::GetMapStyle() const
 
 void Framework::SetupMeasurementSystem()
 {
+  Settings::Units units = Settings::Metric;
+  Settings::Get("Units", units);
+  LOG(LDEBUG, ("Units =", units));
+  m_routingSession.SetTurnNotificationsUnits(units == Settings::Foot ?
+                                             routing::turns::sound::LengthUnits::Feet :
+                                             routing::turns::sound::LengthUnits::Meters);
+
   m_informationDisplay.measurementSystemChanged();
   Invalidate();
 }
diff --git a/map/framework.hpp b/map/framework.hpp
index 8f49ae66c2..a42fb82ad0 100644
--- a/map/framework.hpp
+++ b/map/framework.hpp
@@ -582,14 +582,6 @@ public:
   // Sound notifications for turn instructions.
   inline void EnableTurnNotifications(bool enable) { m_routingSession.EnableTurnNotifications(enable); }
   inline bool AreTurnNotificationsEnabled() const { return m_routingSession.AreTurnNotificationsEnabled(); }
-  inline void SetTurnNotificationsUnits(routing::turns::sound::LengthUnits const & units)
-  {
-    m_routingSession.SetTurnNotificationsUnits(units);
-  }
-  inline routing::turns::sound::LengthUnits GetTurnNotificationsUnits() const
-  {
-    return m_routingSession.GetTurnNotificationsUnits();
-  }
   inline void SetTurnNotificationsLocale(string const & locale) { m_routingSession.SetTurnNotificationsLocale(locale); }
   inline string GetTurnNotificationsLocale() const { return m_routingSession.GetTurnNotificationsLocale(); }
 
diff --git a/routing/routing_session.cpp b/routing/routing_session.cpp
index c185adfbaa..583247403f 100644
--- a/routing/routing_session.cpp
+++ b/routing/routing_session.cpp
@@ -310,13 +310,6 @@ void RoutingSession::SetTurnNotificationsUnits(routing::turns::sound::LengthUnit
   m_turnsSound.SetLengthUnits(units);
 }
 
-routing::turns::sound::LengthUnits RoutingSession::GetTurnNotificationsUnits() const
-{
-  threads::MutexGuard guard(m_routeSessionMutex);
-  UNUSED_VALUE(guard);
-  return m_turnsSound.GetLengthUnits();
-}
-
 void RoutingSession::SetTurnNotificationsLocale(string const & locale)
 {
   threads::MutexGuard guard(m_routeSessionMutex);
diff --git a/routing/routing_session.hpp b/routing/routing_session.hpp
index 09629c7a5f..086d5a11f4 100644
--- a/routing/routing_session.hpp
+++ b/routing/routing_session.hpp
@@ -92,7 +92,6 @@ public:
   void EnableTurnNotifications(bool enable);
   bool AreTurnNotificationsEnabled() const;
   void SetTurnNotificationsUnits(routing::turns::sound::LengthUnits const & units);
-  routing::turns::sound::LengthUnits GetTurnNotificationsUnits() const;
   void SetTurnNotificationsLocale(string const & locale);
   string GetTurnNotificationsLocale() const;