diff --git a/android/jni/com/mapswithme/platform/Platform.cpp b/android/jni/com/mapswithme/platform/Platform.cpp
index 07798a8098..07e12c66ca 100644
--- a/android/jni/com/mapswithme/platform/Platform.cpp
+++ b/android/jni/com/mapswithme/platform/Platform.cpp
@@ -28,7 +28,13 @@ std::string Platform::UniqueClientId() const
   return result;
 }
 
-string Platform::MacAddress(bool md5Decoded) const
+std::string Platform::AdvertisingId() const
+{
+  //TODO(@alexzatsepin): Implement me.
+  return {};
+}
+
+std::string Platform::MacAddress(bool md5Decoded) const
 {
   JNIEnv * env = jni::GetEnv();
   static jmethodID const getMacAddressMethod = jni::GetStaticMethodID(env, g_utilsClazz, "getMacAddress",
diff --git a/platform/http_uploader.hpp b/platform/http_uploader.hpp
index 5f2e6dd67c..998f0625fe 100644
--- a/platform/http_uploader.hpp
+++ b/platform/http_uploader.hpp
@@ -23,6 +23,7 @@ public:
   void SetHeaders(std::map<std::string, std::string> const & headers) { m_headers = headers; }
   void SetFileKey(std::string const & fileKey) { m_fileKey = fileKey; }
   void SetFilePath(std::string const & filePath) { m_filePath = filePath; }
+  void SetNeedClientAuth(bool needClientAuth) { m_needClientAuth = needClientAuth; }
 
   Result Upload() const;
 
@@ -33,5 +34,6 @@ private:
   std::map<std::string, std::string> m_headers;
   std::string m_fileKey = "file";
   std::string m_filePath;
+  bool m_needClientAuth = false;
 };
 }  // namespace platform
diff --git a/platform/platform.hpp b/platform/platform.hpp
index 56d81818fd..3d252901e6 100644
--- a/platform/platform.hpp
+++ b/platform/platform.hpp
@@ -256,6 +256,8 @@ public:
 
   std::string UniqueClientId() const;
 
+  std::string AdvertisingId() const;
+
   std::string MacAddress(bool md5Decoded) const;
 
   /// @return url for clients to download maps
diff --git a/platform/platform_ios.mm b/platform/platform_ios.mm
index da9a1018fe..c4383dfa96 100644
--- a/platform/platform_ios.mm
+++ b/platform/platform_ios.mm
@@ -128,6 +128,12 @@ int Platform::PreCachingDepth() const { return 2; }
 
 std::string Platform::UniqueClientId() const { return [Alohalytics installationId].UTF8String; }
 
+std::string Platform::AdvertisingId() const
+{
+  //TODO(@beloal): Implement me.
+  return {};
+}
+
 std::string Platform::MacAddress(bool md5Decoded) const
 {
   // Not implemented.
diff --git a/platform/platform_linux.cpp b/platform/platform_linux.cpp
index d548ca5a85..c86e81fc55 100644
--- a/platform/platform_linux.cpp
+++ b/platform/platform_linux.cpp
@@ -214,6 +214,11 @@ string Platform::UniqueClientId() const
   return "n0dbus0n0lsb00000000000000000000";
 }
 
+string Platform::AdvertisingId() const
+{
+  return {};
+}
+
 string Platform::MacAddress(bool md5Decoded) const
 {
   // Not implemented.
diff --git a/platform/platform_mac.mm b/platform/platform_mac.mm
index 9171086562..2da6bfc6b5 100644
--- a/platform/platform_mac.mm
+++ b/platform/platform_mac.mm
@@ -114,6 +114,11 @@ Platform::Platform()
 
 string Platform::UniqueClientId() const { return [Alohalytics installationId].UTF8String; }
 
+string Platform::AdvertisingId() const
+{
+  return {};
+}
+
 string Platform::MacAddress(bool md5Decoded) const
 {
   // Not implemented.
diff --git a/platform/platform_tizen.cpp b/platform/platform_tizen.cpp
index df0d58eab9..c36c4fdc91 100644
--- a/platform/platform_tizen.cpp
+++ b/platform/platform_tizen.cpp
@@ -55,6 +55,11 @@ string Platform::UniqueClientId() const
   return FromTizenString(pApp->GetAppId());
 }
 
+string Platform::AdvertisingId() const
+{
+  return {};
+}
+
 string Platform::DeviceName() const
 {
   return OMIM_OS_NAME;
diff --git a/platform/platform_win.cpp b/platform/platform_win.cpp
index c8d48ba2f3..d92f9c2752 100644
--- a/platform/platform_win.cpp
+++ b/platform/platform_win.cpp
@@ -136,6 +136,11 @@ string Platform::UniqueClientId() const
   return "@TODO";
 }
 
+string Platform::AdvertisingId() const
+{
+  return {};
+}
+
 string Platform::MacAddress(bool md5Decoded) const
 {
   // Not implemented.