Merge remote-tracking branch 'origin/develop' into feature/nav_subscription_buttons

19 files changed, 432 insertions, 41 deletions

diff --git a/src/appMain/hmi_capabilities.json b/src/appMain/hmi_capabilities.json
index 873c80d32e..481c6d0c6b 100755
--- a/src/appMain/hmi_capabilities.json
+++ b/src/appMain/hmi_capabilities.json
@@ -428,6 +428,7 @@
                         "acMaxEnableAvailable": true,
                         "autoModeEnableAvailable": true,
                         "circulateAirEnableAvailable": true,
+                        "climateEnableAvailable": true,
                         "currentTemperatureAvailable": true,
                         "defrostZone": [
                             "FRONT",
@@ -455,7 +456,7 @@
                 ],
                 "radioControlCapabilities": [
                     {
-                        "availableHDsAvailable": true,
+                        "availableHdChannelsAvailable": true,
                         "hdChannelAvailable": true,
                         "moduleName": "radio",
                         "radioBandAvailable": true,
diff --git a/src/appMain/smartDeviceLink.ini b/src/appMain/smartDeviceLink.ini
index 54c2395c47..40c1bf08a7 100644
--- a/src/appMain/smartDeviceLink.ini
+++ b/src/appMain/smartDeviceLink.ini
@@ -202,6 +202,9 @@ TCPAdapterPort = 12345
 ; If the name is omitted, Core will listen on all network interfaces by binding to INADDR_ANY.
 TCPAdapterNetworkInterface =
 
+; 128 bit uuid for bluetooth device discovery. Please format as 16 seperate bytes.
+;BluetoothUUID = 0x93, 0x6D, 0xA0, 0x1F, 0x9A, 0xBD, 0x4D, 0x9D, 0x80, 0xC7, 0x02, 0xAF, 0x85, 0xC8, 0x22, 0xA8
+
 [CloudAppConnections]
 ; Value in milliseconds for time between retry attempts on a failed websocket connection
 CloudAppRetryTimeout = 1000 
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/rc_module_constants.h b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/rc_module_constants.h
index 92ff7e5f01..b9f922a1be 100644
--- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/rc_module_constants.h
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/rc_module_constants.h
@@ -152,6 +152,7 @@ const char kBand[] = "band";
 const char kRdsData[] = "rdsData";
 const char kHdRadioEnable[] = "hdRadioEnable";
 const char kAvailableHDs[] = "availableHDs";
+const char kAvailableHdChannels[] = "availableHdChannels";
 const char kHdChannel[] = "hdChannel";
 const char kSignalStrength[] = "signalStrength";
 const char kSignalChangeThreshold[] = "signalChangeThreshold";
@@ -176,6 +177,8 @@ const char kHeatedSteeringWheelEnable[] = "heatedSteeringWheelEnable";
 const char kHeatedWindshieldEnable[] = "heatedWindshieldEnable";
 const char kHeatedRearWindowEnable[] = "heatedRearWindowEnable";
 const char kHeatedMirrorsEnable[] = "heatedMirrorsEnable";
+const char kClimateEnable[] = "climateEnable";
+const char kClimateEnableAvailable[] = "climateEnableAvailable";
 // ClimateControlData struct
 
 // LightControlData
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/get_interior_vehicle_data_request.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/get_interior_vehicle_data_request.cc
index 47363bddcd..ded96461f5 100644
--- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/get_interior_vehicle_data_request.cc
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/get_interior_vehicle_data_request.cc
@@ -109,6 +109,7 @@ void GetInteriorVehicleDataRequest::FilterDisabledModuleData(
       module_data[message_params::kHdRadioEnable].asBool() == false) {
     module_data.erase(message_params::kHdChannel);
     module_data.erase(message_params::kAvailableHDs);
+    module_data.erase(message_params::kAvailableHdChannels);
     module_data.erase(message_params::kSisData);
   }
 }
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/set_interior_vehicle_data_request.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/set_interior_vehicle_data_request.cc
index 2bf8fbbe92..44d302276d 100644
--- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/set_interior_vehicle_data_request.cc
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/set_interior_vehicle_data_request.cc
@@ -55,6 +55,7 @@ std::vector<std::string> GetModuleReadOnlyParams(
   } else if (enums_value::kRadio == module_type) {
     module_ro_params.push_back(kRdsData);
     module_ro_params.push_back(kAvailableHDs);
+    module_ro_params.push_back(kAvailableHdChannels);
     module_ro_params.push_back(kSignalStrength);
     module_ro_params.push_back(kSignalChangeThreshold);
     module_ro_params.push_back(kState);
@@ -92,6 +93,8 @@ const std::map<std::string, std::string> GetModuleDataToCapabilitiesMapping() {
   mapping["heatedWindshieldEnable"] = "heatedWindshieldAvailable";
   mapping["heatedMirrorsEnable"] = "heatedMirrorsAvailable";
   mapping["heatedRearWindowEnable"] = "heatedRearWindowAvailable";
+  mapping["climateEnable"] = "climateEnableAvailable";
+  mapping["climateEnableAvailable"] = "climateEnableAvailable";
 
   // radio
   mapping["band"] = "radioBandAvailable";
@@ -99,7 +102,8 @@ const std::map<std::string, std::string> GetModuleDataToCapabilitiesMapping() {
   mapping["frequencyFraction"] = "radioFrequencyAvailable";
   mapping["rdsData"] = "rdsDataAvailable";
   mapping["availableHDs"] = "availableHDsAvailable";
-  mapping["hdChannel"] = "availableHDsAvailable";
+  mapping["availableHdChannels"] = "availableHdChannelsAvailable";
+  mapping["hdChannel"] = "availableHdChannelsAvailable";
   mapping["hdRadioEnable"] = "hdRadioEnableAvailable";
   mapping["signalStrength"] = "signalStrengthAvailable";
   mapping["signalChangeThreshold"] = "signalChangeThresholdAvailable";
@@ -716,21 +720,6 @@ void SetInteriorVehicleDataRequest::CutOffReadOnlyParams(
   const smart_objects::SmartObject& module_type_params =
       ControlData(module_data);
   const std::string module_type = ModuleType();
-  std::vector<std::string> ro_params = GetModuleReadOnlyParams(module_type);
-
-  for (auto& it : ro_params) {
-    if (module_type_params.keyExists(it)) {
-      if (enums_value::kClimate == module_type) {
-        module_data[message_params::kClimateControlData].erase(it);
-      } else if (enums_value::kRadio == module_type) {
-        module_data[message_params::kRadioControlData].erase(it);
-      } else {
-        continue;
-      }
-
-      LOG4CXX_DEBUG(logger_, "Cutting-off READ ONLY parameter: " << it);
-    }
-  }
 
   if (enums_value::kAudio == module_type) {
     auto& equalizer_settings = module_data[message_params::kAudioControlData]
@@ -745,6 +734,15 @@ void SetInteriorVehicleDataRequest::CutOffReadOnlyParams(
       }
     }
   }
+
+  std::vector<std::string> ro_params = GetModuleReadOnlyParams(module_type);
+  const auto& data_mapping = RCHelpers::GetModuleTypeToDataMapping();
+  for (const auto& param : ro_params) {
+    if (module_type_params.keyExists(param)) {
+      module_data[data_mapping(module_type)].erase(param);
+      LOG4CXX_DEBUG(logger_, "Cutting-off READ ONLY parameter: " << param);
+    }
+  }
 }
 
 std::string SetInteriorVehicleDataRequest::ModuleType() {
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/get_interior_vehicle_data_request_test.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/get_interior_vehicle_data_request_test.cc
index 9549830cec..1adc8caf93 100644
--- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/get_interior_vehicle_data_request_test.cc
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/get_interior_vehicle_data_request_test.cc
@@ -44,6 +44,7 @@
 #include "rc_rpc_plugin/rc_module_constants.h"
 #include "rc_rpc_plugin/rc_rpc_plugin.h"
 
+#include <stdint.h>
 #include <chrono>
 #include <thread>
 
@@ -205,6 +206,8 @@ TEST_F(GetInteriorVehicleDataRequestTest,
           HMIResultCodeIs(hmi_apis::FunctionID::RC_GetInteriorVehicleData), _))
       .WillOnce(Return(true));
   // Act
+
+  ASSERT_TRUE(command->Init());
   command->Run();
 }
 
@@ -232,6 +235,7 @@ TEST_F(GetInteriorVehicleDataRequestTest,
           HMIResultCodeIs(hmi_apis::FunctionID::RC_GetInteriorVehicleData), _))
       .WillOnce(Return(true));
   // Act
+  ASSERT_TRUE(command->Init());
   command->Run();
 }
 
@@ -263,6 +267,7 @@ TEST_F(
       .WillOnce(DoAll(SaveArg<0>(&command_result), Return(true)));
 
   // Act
+  ASSERT_TRUE(command->Init());
   command->Run();
 
   // Assert
@@ -314,6 +319,7 @@ TEST_F(
       command = CreateRCCommand<
           rc_rpc_plugin::commands::GetInteriorVehicleDataRequest>(
           mobile_message);
+  ASSERT_TRUE(command->Init());
   command->Run();
   application_manager::event_engine::Event event(
       hmi_apis::FunctionID::RC_GetInteriorVehicleData);
@@ -358,6 +364,7 @@ TEST_F(GetInteriorVehicleDataRequestTest,
       .WillOnce(DoAll(SaveArg<0>(&command_result), Return(true)));
 
   // Act
+  ASSERT_TRUE(command->Init());
   command->Run();
 
   // Assert
@@ -393,6 +400,7 @@ TEST_F(
           MobileResultCodeIs(mobile_apis::Result::UNSUPPORTED_RESOURCE), _))
       .WillOnce((Return(true)));
   // Act
+  ASSERT_TRUE(command->Init());
   command->Run();
 }
 
@@ -418,6 +426,7 @@ TEST_F(
       .WillOnce((Return(true)));
 
   // Act
+  ASSERT_TRUE(command->Init());
   command->Run();
 }
 
@@ -458,6 +467,7 @@ TEST_F(GetInteriorVehicleDataRequestTest,
   application_manager::event_engine::Event event(
       hmi_apis::FunctionID::RC_GetInteriorVehicleData);
   event.set_smart_object(*hmi_response_message);
+  ASSERT_TRUE(command->Init());
   command->Run();
   command->on_event(event);
 }
@@ -498,6 +508,7 @@ TEST_F(GetInteriorVehicleDataRequestTest,
       hmi_apis::FunctionID::RC_GetInteriorVehicleData);
   event.set_smart_object(*hmi_message);
   auto command = CreateRCCommand<GetInteriorVehicleDataRequest>(mobile_message);
+  ASSERT_TRUE(command->Init());
   command->Run();
   command->on_event(event);
 }
@@ -542,6 +553,7 @@ TEST_F(GetInteriorVehicleDataRequestTest,
       command = CreateRCCommand<
           rc_rpc_plugin::commands::GetInteriorVehicleDataRequest>(
           mobile_message);
+  ASSERT_TRUE(command->Init());
   command->Run();
   application_manager::event_engine::Event event(
       hmi_apis::FunctionID::RC_GetInteriorVehicleData);
@@ -583,6 +595,7 @@ TEST_F(GetInteriorVehicleDataRequestTest,
             _))
         .WillRepeatedly(Return(true));
     // Act
+    ASSERT_TRUE(command->Init());
     command->Run();
   }
 
@@ -597,6 +610,130 @@ TEST_F(GetInteriorVehicleDataRequestTest,
   EXPECT_CALL(mock_rpc_service_, ManageHMICommand(_, _)).Times(0);
 
   // Act
+  ASSERT_TRUE(command->Init());
   command->Run();
 }
+
+TEST_F(GetInteriorVehicleDataRequestTest,
+       OnEvent_ValidHmiResponse_AvailableHDChanelsIsArrayWithHDChanels) {
+  using rc_rpc_plugin::commands::GetInteriorVehicleDataRequest;
+  namespace hmi_response = application_manager::hmi_response;
+  namespace strings = application_manager::strings;
+
+  const uint32_t chanel1_index = 1u;
+  const uint32_t chanel2_index = 2u;
+  const uint32_t chanel3_index = 3u;
+
+  const uint32_t expected_array_length = 3u;
+
+  // Arrange
+  MessageSharedPtr mobile_message = CreateBasicMessage();
+
+  MessageSharedPtr hmi_response_message = CreateBasicMessage();
+  auto& hmi_response_params = (*hmi_response_message)[strings::msg_params];
+  hmi_response_params[hmi_response::code] = hmi_apis::Common_Result::SUCCESS;
+  hmi_response_params[strings::connection_key] = kAppId;
+
+  auto& msg_params = (*hmi_response_message)[strings::msg_params];
+  msg_params[message_params::kModuleType] = module_type;
+
+  auto available_hd_chanels =
+      smart_objects::SmartObject(smart_objects::SmartType_Array);
+
+  available_hd_chanels[0] = chanel1_index;
+  available_hd_chanels[1] = chanel2_index;
+  available_hd_chanels[2] = chanel3_index;
+
+  msg_params[message_params::kModuleData][message_params::kRadioControlData]
+            [message_params::kAvailableHdChannels] = available_hd_chanels;
+
+  ON_CALL(mock_interior_data_cache_, Contains(_)).WillByDefault(Return(false));
+  ON_CALL(mock_interior_data_manager_, CheckRequestsToHMIFrequency(_))
+      .WillByDefault(Return(true));
+
+  MessageSharedPtr message_to_mob = CreateBasicMessage();
+
+  // Expectations
+  EXPECT_CALL(mock_rpc_service_, ManageHMICommand(_, _)).WillOnce(Return(true));
+  EXPECT_CALL(mock_rpc_service_, ManageMobileCommand(_, _))
+      .WillOnce(DoAll(SaveArg<0>(&message_to_mob), Return(true)));
+
+  // Act
+  auto command = CreateRCCommand<GetInteriorVehicleDataRequest>(mobile_message);
+  application_manager::event_engine::Event event(
+      hmi_apis::FunctionID::RC_GetInteriorVehicleData);
+
+  ASSERT_TRUE(command->Init());
+  command->Run();
+
+  event.set_smart_object(*hmi_response_message);
+  command->on_event(event);
+
+  auto& hd_chanels =
+      (*message_to_mob)[strings::msg_params][message_params::kModuleData]
+                       [message_params::kRadioControlData]
+                       [message_params::kAvailableHdChannels];
+  const size_t array_length = hd_chanels.length();
+
+  EXPECT_EQ(expected_array_length, array_length);
+
+  EXPECT_EQ(chanel1_index, hd_chanels[0].asUInt());
+  EXPECT_EQ(chanel2_index, hd_chanels[1].asUInt());
+  EXPECT_EQ(chanel3_index, hd_chanels[2].asUInt());
+}
+
+TEST_F(GetInteriorVehicleDataRequestTest,
+       OnEvent_ValidHmiResponse_ClimateEnableAvailable) {
+  using rc_rpc_plugin::commands::GetInteriorVehicleDataRequest;
+  namespace hmi_response = application_manager::hmi_response;
+  namespace strings = application_manager::strings;
+
+  // Arrange
+  MessageSharedPtr mobile_message = CreateBasicMessage();
+
+  MessageSharedPtr hmi_response_message = CreateBasicMessage();
+  auto& hmi_response_params = (*hmi_response_message)[strings::msg_params];
+  hmi_response_params[hmi_response::code] = hmi_apis::Common_Result::SUCCESS;
+  hmi_response_params[strings::connection_key] = kAppId;
+
+  auto& msg_params = (*hmi_response_message)[strings::msg_params];
+
+  auto climate_control_data =
+      smart_objects::SmartObject(smart_objects::SmartType_Boolean);
+  climate_control_data = true;
+
+  msg_params[message_params::kModuleData][message_params::kClimateControlData]
+            [message_params::kClimateEnableAvailable] = climate_control_data;
+
+  ON_CALL(mock_interior_data_cache_, Contains(_)).WillByDefault(Return(false));
+  ON_CALL(mock_interior_data_manager_, CheckRequestsToHMIFrequency(_))
+      .WillByDefault(Return(true));
+
+  auto message_to_mob = CreateBasicMessage();
+
+  // Expectations
+  EXPECT_CALL(mock_rpc_service_, ManageHMICommand(_, _)).WillOnce(Return(true));
+  EXPECT_CALL(mock_rpc_service_, ManageMobileCommand(_, _))
+      .WillOnce(DoAll(SaveArg<0>(&message_to_mob), Return(true)));
+
+  // Act
+  auto command = CreateRCCommand<GetInteriorVehicleDataRequest>(mobile_message);
+  application_manager::event_engine::Event event(
+      hmi_apis::FunctionID::RC_GetInteriorVehicleData);
+
+  ASSERT_TRUE(command->Init());
+  command->Run();
+
+  event.set_smart_object(*hmi_response_message);
+  command->on_event(event);
+
+  const bool climate_enable_available =
+      (*message_to_mob)[strings::msg_params][message_params::kModuleData]
+                       [message_params::kClimateControlData]
+                       [message_params::kClimateEnableAvailable]
+                           .asBool();
+
+  EXPECT_TRUE(climate_enable_available);
+}
+
 }  // namespace rc_rpc_plugin_test
diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/set_interior_vehicle_data_request_test.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/set_interior_vehicle_data_request_test.cc
index 66280eb183..f7718a7248 100644
--- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/set_interior_vehicle_data_request_test.cc
+++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/set_interior_vehicle_data_request_test.cc
@@ -34,7 +34,6 @@
 #include "application_manager/application.h"
 #include "application_manager/commands/command_request_test.h"
 #include "application_manager/mock_application.h"
-#include "gtest/gtest.h"
 #include "interfaces/MOBILE_API.h"
 #include "rc_rpc_plugin/mock/mock_interior_data_cache.h"
 #include "rc_rpc_plugin/mock/mock_interior_data_manager.h"
@@ -42,15 +41,20 @@
 #include "rc_rpc_plugin/rc_module_constants.h"
 #include "rc_rpc_plugin/rc_rpc_plugin.h"
 
+#include <stdint.h>
+#include "gtest/gtest.h"
+
 using application_manager::ApplicationSet;
 using application_manager::commands::MessageSharedPtr;
 using test::components::application_manager_test::MockApplication;
 using test::components::application_manager_test::MockApplicationManager;
 using test::components::commands_test::CommandRequestTest;
 using test::components::commands_test::CommandsTestMocks;
+using test::components::commands_test::HMIResultCodeIs;
 using ::testing::_;
 using ::testing::NiceMock;
 using ::testing::Return;
+using ::testing::SaveArg;
 
 namespace {
 const uint32_t kAppId = 0u;
@@ -140,8 +144,11 @@ TEST_F(SetInteriorVehicleDataRequestTest,
       (*mobile_message)[application_manager::strings::msg_params];
   msg_params[message_params::kModuleData][message_params::kModuleType] =
       mobile_apis::ModuleType::CLIMATE;
+  smart_objects::SmartObject climate_control_data(smart_objects::SmartType_Map);
+  climate_control_data[message_params::kFanSpeed] = 10;
+
   msg_params[message_params::kModuleData][message_params::kClimateControlData] =
-      smart_objects::SmartObject(smart_objects::SmartType_Map);
+      climate_control_data;
   // Expectations
   EXPECT_CALL(mock_policy_handler_, CheckModule(kPolicyAppId, _))
       .WillOnce(Return(rc_rpc_plugin::TypeAccess::kAllowed));
@@ -151,14 +158,15 @@ TEST_F(SetInteriorVehicleDataRequestTest,
 
   EXPECT_CALL(
       mock_rpc_service_,
-      ManageMobileCommand(test::components::commands_test::MobileResultCodeIs(
-                              mobile_apis::Result::READ_ONLY),
-                          application_manager::commands::Command::SOURCE_SDL));
+      ManageHMICommand(
+          HMIResultCodeIs(hmi_apis::FunctionID::RC_SetInteriorVehicleData), _))
+      .WillOnce(Return(true));
   // Act
   std::shared_ptr<rc_rpc_plugin::commands::SetInteriorVehicleDataRequest>
       command = CreateRCCommand<
           rc_rpc_plugin::commands::SetInteriorVehicleDataRequest>(
           mobile_message);
+  ASSERT_TRUE(command->Init());
   command->Run();
 }
 
@@ -189,15 +197,16 @@ TEST_F(
 
   EXPECT_CALL(
       mock_rpc_service_,
-      ManageMobileCommand(test::components::commands_test::MobileResultCodeIs(
-                              mobile_apis::Result::OUT_OF_MEMORY),
-                          application_manager::commands::Command::SOURCE_SDL));
+      ManageHMICommand(
+          HMIResultCodeIs(hmi_apis::FunctionID::RC_SetInteriorVehicleData), _))
+      .WillOnce(Return(true));
 
   // Act
   std::shared_ptr<rc_rpc_plugin::commands::SetInteriorVehicleDataRequest>
       command = CreateRCCommand<
           rc_rpc_plugin::commands::SetInteriorVehicleDataRequest>(
           mobile_message);
+  ASSERT_TRUE(command->Init());
   command->Run();
 }
 
@@ -229,7 +238,99 @@ TEST_F(
       command = CreateRCCommand<
           rc_rpc_plugin::commands::SetInteriorVehicleDataRequest>(
           mobile_message);
+  ASSERT_TRUE(command->Init());
   command->Run();
 }
 
+TEST_F(SetInteriorVehicleDataRequestTest,
+       Execute_ValidWithSettableParams_SUCCESSSendToHMI) {
+  MessageSharedPtr mobile_message = CreateBasicMessage();
+  auto& msg_params =
+      (*mobile_message)[application_manager::strings::msg_params];
+  msg_params[message_params::kModuleData][message_params::kModuleType] =
+      mobile_apis::ModuleType::CLIMATE;
+
+  msg_params[message_params::kModuleData][message_params::kClimateControlData] =
+      smart_objects::SmartObject(smart_objects::SmartType_Map);
+
+  msg_params[message_params::kModuleData][message_params::kClimateControlData]
+            [message_params::kClimateEnable] = true;
+
+  // Expectations
+  EXPECT_CALL(mock_policy_handler_, CheckModule(kPolicyAppId, _))
+      .WillOnce(Return(rc_rpc_plugin::TypeAccess::kAllowed));
+
+  EXPECT_CALL(mock_hmi_capabilities_, rc_capability())
+      .WillOnce(Return(nullptr));
+
+  MessageSharedPtr message_from_mobile = CreateBasicMessage();
+
+  EXPECT_CALL(mock_rpc_service_, ManageHMICommand(_, _))
+      .WillOnce(DoAll(SaveArg<0>(&message_from_mobile), Return(true)));
+
+  std::shared_ptr<rc_rpc_plugin::commands::SetInteriorVehicleDataRequest>
+      command = CreateRCCommand<
+          rc_rpc_plugin::commands::SetInteriorVehicleDataRequest>(
+          mobile_message);
+
+  ASSERT_TRUE(command->Init());
+  command->Run();
+
+  auto& msg_params_from_mobile =
+      (*message_from_mobile)[application_manager::strings::msg_params];
+
+  const bool climate_enable =
+      msg_params_from_mobile[message_params::kModuleData]
+                            [message_params::kClimateControlData]
+                            [message_params::kClimateEnable]
+                                .asBool();
+  EXPECT_TRUE(climate_enable);
+}
+
+TEST_F(SetInteriorVehicleDataRequestTest,
+       Execute_ValidWithSettableParams_SUCCESSSendToHMI_HDChannel) {
+  MessageSharedPtr mobile_message = CreateBasicMessage();
+  auto& msg_params =
+      (*mobile_message)[application_manager::strings::msg_params];
+  msg_params[message_params::kModuleData][message_params::kModuleType] =
+      mobile_apis::ModuleType::RADIO;
+
+  msg_params[message_params::kModuleData][message_params::kRadioControlData] =
+      smart_objects::SmartObject(smart_objects::SmartType_Map);
+
+  const std::uint32_t hd_channel = 2u;
+  msg_params[message_params::kModuleData][message_params::kRadioControlData]
+            [message_params::kHdChannel] = hd_channel;
+
+  // Expectations
+  EXPECT_CALL(mock_policy_handler_, CheckModule(kPolicyAppId, _))
+      .WillOnce(Return(rc_rpc_plugin::TypeAccess::kAllowed));
+
+  EXPECT_CALL(mock_hmi_capabilities_, rc_capability())
+      .WillOnce(Return(nullptr));
+
+  auto message_from_mobile = CreateBasicMessage();
+
+  EXPECT_CALL(mock_rpc_service_, ManageHMICommand(_, _))
+      .WillOnce(DoAll(SaveArg<0>(&message_from_mobile), Return(true)));
+
+  std::shared_ptr<rc_rpc_plugin::commands::SetInteriorVehicleDataRequest>
+      command = CreateRCCommand<
+          rc_rpc_plugin::commands::SetInteriorVehicleDataRequest>(
+          mobile_message);
+
+  command->Init();
+  command->Run();
+
+  auto& msg_params_from_mobile =
+      (*message_from_mobile)[application_manager::strings::msg_params];
+
+  const uint64_t hd_channel_from_hmi =
+      msg_params_from_mobile[message_params::kModuleData]
+                            [message_params::kRadioControlData]
+                            [message_params::kHdChannel]
+                                .asUInt();
+
+  EXPECT_EQ(hd_channel, hd_channel_from_hmi);
+}
 }  // namespace rc_rpc_plugin_test
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_system_capability_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_system_capability_request.cc
index 4b34db9934..0655da27c0 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_system_capability_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/get_system_capability_request.cc
@@ -89,7 +89,7 @@ void GetSystemCapabilityRequest::Run() {
       bool has_nav_capability = false;
       if (hmi_capabilities.navigation_capability()) {
         has_nav_capability = true;
-        auto nav_capability = *hmi_capabilities.navigation_capability();
+        nav_capability = *hmi_capabilities.navigation_capability();
       }
 
       has_nav_capability = application_manager_.GetAppServiceManager()
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/rc_get_capabilities_response_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/rc_get_capabilities_response_test.cc
index d6df3e61ee..67c36dce9c 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/rc_get_capabilities_response_test.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/hmi/rc_get_capabilities_response_test.cc
@@ -139,6 +139,7 @@ TEST_F(RCGetCapabilitiesResponseTest, RUN_SUCCESSS) {
   radio_control_capability["hdChannelAvailable"] = true;
   radio_control_capability["rdsDataAvailable"] = true;
   radio_control_capability["availableHDsAvailable"] = true;
+  radio_control_capability["availableHdChannelsAvailable"] = true;
   radio_control_capability["stateAvailable"] = true;
   radio_control_capability["signalStrengthAvailable"] = true;
   radio_control_capability["signalChangeThresholdAvailable"] = true;
diff --git a/src/components/config_profile/include/config_profile/profile.h b/src/components/config_profile/include/config_profile/profile.h
index 1d3766ca97..0a1e8b2c17 100644
--- a/src/components/config_profile/include/config_profile/profile.h
+++ b/src/components/config_profile/include/config_profile/profile.h
@@ -423,6 +423,8 @@ class Profile : public protocol_handler::ProtocolHandlerSettings,
    */
   uint16_t cloud_app_max_retry_attempts() const OVERRIDE;
 
+  const uint8_t* bluetooth_uuid() const OVERRIDE;
+
   // TransportManageMMESettings interface
 
   const std::string& event_mq_name() const OVERRIDE;
@@ -610,6 +612,10 @@ class Profile : public protocol_handler::ProtocolHandlerSettings,
                                     const char* const pKey,
                                     bool* out_result) const;
 
+  std::vector<uint8_t> ReadUint8Container(const char* const pSection,
+                                          const char* const pKey,
+                                          bool* out_result) const;
+
   /**
    * @brief Returns delimiter for SDL-generated TTS chunks
    * @return TTS delimiter
@@ -975,6 +981,7 @@ class Profile : public protocol_handler::ProtocolHandlerSettings,
   std::string transport_manager_tcp_adapter_network_interface_;
   uint32_t cloud_app_retry_timeout_;
   uint16_t cloud_app_max_retry_attempts_;
+  std::vector<uint8_t> bluetooth_uuid_;
   std::string tts_delimiter_;
   uint32_t audio_data_stopped_timeout_;
   uint32_t video_data_stopped_timeout_;
diff --git a/src/components/config_profile/src/profile.cc b/src/components/config_profile/src/profile.cc
index a5b2daa130..c38b28db5f 100644
--- a/src/components/config_profile/src/profile.cc
+++ b/src/components/config_profile/src/profile.cc
@@ -184,6 +184,7 @@ const char* kAppHmiLevelNoneRequestsTimeScaleKey =
 const char* kPendingRequestsAmoundKey = "PendingRequestsAmount";
 const char* kSupportedDiagModesKey = "SupportedDiagModes";
 const char* kTransportManagerDisconnectTimeoutKey = "DisconnectTimeout";
+const char* kBluetoothUUIDKey = "BluetoothUUID";
 const char* kTTSDelimiterKey = "TTSDelimiter";
 const char* kRecordingFileNameKey = "RecordingFileName";
 const char* kRecordingFileSourceKey = "RecordingFileSource";
@@ -397,6 +398,22 @@ const bool kDefaultMultipleTransportsEnabled = false;
 const char* kDefaultLowBandwidthResumptionLevel = "NONE";
 const uint32_t kDefaultRpcPassThroughTimeout = 10000;
 const char* kDefaultHMIOriginId = "HMI_ID";
+const std::vector<uint8_t> kDefaultBluetoothUUID = {0x93,
+                                                    0x6D,
+                                                    0xA0,
+                                                    0x1F,
+                                                    0x9A,
+                                                    0xBD,
+                                                    0x4D,
+                                                    0x9D,
+                                                    0x80,
+                                                    0xC7,
+                                                    0x02,
+                                                    0xAF,
+                                                    0x85,
+                                                    0xC8,
+                                                    0x22,
+                                                    0xA8};
 }  // namespace
 
 namespace profile {
@@ -806,6 +823,10 @@ uint16_t Profile::cloud_app_max_retry_attempts() const {
   return cloud_app_max_retry_attempts_;
 }
 
+const uint8_t* Profile::bluetooth_uuid() const {
+  return bluetooth_uuid_.data();
+}
+
 const std::string& Profile::tts_delimiter() const {
   return tts_delimiter_;
 }
@@ -1821,6 +1842,13 @@ void Profile::UpdateValues() {
                     kCloudAppMaxRetryAttemptsKey,
                     kCloudAppTransportSection);
 
+  bool read_result = true;
+  bluetooth_uuid_ = ReadUint8Container(
+      kTransportManagerSection, kBluetoothUUIDKey, &read_result);
+  if (!read_result || bluetooth_uuid_.size() != 16) {
+    bluetooth_uuid_ = kDefaultBluetoothUUID;
+  }
+
   // Event MQ
   ReadStringValue(
       &event_mq_name_, kDefaultEventMQ, kTransportManagerSection, kEventMQKey);
@@ -2449,6 +2477,10 @@ int32_t hex_to_int(const std::string& value) {
   return static_cast<int32_t>(strtol(value.c_str(), NULL, 16));
 }
 
+uint8_t hex_to_uint8(const std::string& value) {
+  return static_cast<uint8_t>(strtol(value.c_str(), NULL, 16));
+}
+
 std::string trim_string(const std::string& str) {
   const char* delims = " \t";
 
@@ -2474,6 +2506,18 @@ std::vector<int> Profile::ReadIntContainer(const char* const pSection,
   return value_list;
 }
 
+std::vector<uint8_t> Profile::ReadUint8Container(const char* const pSection,
+                                                 const char* const pKey,
+                                                 bool* out_result) const {
+  const std::vector<std::string> string_list =
+      ReadStringContainer(pSection, pKey, out_result);
+  std::vector<uint8_t> value_list;
+  value_list.resize(string_list.size());
+  std::transform(
+      string_list.begin(), string_list.end(), value_list.begin(), hex_to_uint8);
+  return value_list;
+}
+
 std::vector<std::string> Profile::ReadStringContainer(
     const char* const pSection,
     const char* const pKey,
diff --git a/src/components/include/test/transport_manager/mock_transport_manager_settings.h b/src/components/include/test/transport_manager/mock_transport_manager_settings.h
index 2d9f25a44c..eb12ce1b55 100644
--- a/src/components/include/test/transport_manager/mock_transport_manager_settings.h
+++ b/src/components/include/test/transport_manager/mock_transport_manager_settings.h
@@ -65,6 +65,7 @@ class MockTransportManagerSettings
                      std::string&());
   MOCK_CONST_METHOD0(cloud_app_retry_timeout, uint32_t());
   MOCK_CONST_METHOD0(cloud_app_max_retry_attempts, uint16_t());
+  MOCK_CONST_METHOD0(bluetooth_uuid, const uint8_t*());
 };
 
 }  // namespace transport_manager_test
diff --git a/src/components/include/transport_manager/transport_manager_settings.h b/src/components/include/transport_manager/transport_manager_settings.h
index cbc1516c29..4a183ad22d 100644
--- a/src/components/include/transport_manager/transport_manager_settings.h
+++ b/src/components/include/transport_manager/transport_manager_settings.h
@@ -79,6 +79,8 @@ class TransportManagerSettings : public TransportManagerMMESettings {
    * @brief Returns maximum retry attempts for cloud app connections
    */
   virtual uint16_t cloud_app_max_retry_attempts() const = 0;
+
+  virtual const uint8_t* bluetooth_uuid() const = 0;
 };
 }  // namespace transport_manager
 #endif  // SRC_COMPONENTS_INCLUDE_TRANSPORT_MANAGER_TRANSPORT_MANAGER_SETTINGS_H_
diff --git a/src/components/interfaces/HMI_API.xml b/src/components/interfaces/HMI_API.xml
index d56bf41b64..cc7415c7fe 100644
--- a/src/components/interfaces/HMI_API.xml
+++ b/src/components/interfaces/HMI_API.xml
@@ -1901,9 +1901,15 @@
      <description> True if the hd radio is on, false is the radio is off</description>
    </param>
    <param name="availableHDs" type="Integer" minvalue="1" maxvalue="7" mandatory="false">
-     <description>number of HD sub-channels if available</description>
+    <description>
+       Number of HD sub-channels if available.
+       Note that this parameter is deprecated in MOBILE API.
+    </description>
    </param>
-   <param name="hdChannel" type="Integer" minvalue="1" maxvalue="7" mandatory="false">
+   <param name="availableHdChannels" type="Integer" minvalue="0" maxvalue="7" array="true" minsize="0" maxsize="8" mandatory="false">
+     <description>The list of available hd sub-channel indexes. Empty list means no Hd channel is available. Read-only.</description>
+   </param>
+   <param name="hdChannel" type="Integer" minvalue="0" maxvalue="7" mandatory="false">
      <description>Current HD sub-channel if available</description>
    </param>
    <param name="signalStrength" type="Integer" minvalue="0" maxvalue="100" mandatory="false">
@@ -1957,9 +1963,17 @@
      </description>
    </param>
    <param name="availableHDsAvailable" type="Boolean" mandatory="false" >
-     <description>
+   <description>
        Availability of the getting the number of available HD channels.
        True: Available, False: Not Available, Not present: Not Available.
+       Note that this parameter is deprecated in MOBILE API
+     </description>
+   </param>
+
+   <param name="availableHdChannelsAvailable" type="Boolean" mandatory="false">
+     <description>
+       Availability of the list of available HD sub-channel indexes.
+       True: Available, False: Not Available, Not present: Not Available.
      </description>
    </param>
    <param name="stateAvailable" type="Boolean" mandatory="false" >
@@ -2061,6 +2075,8 @@
    <param name="heatedMirrorsEnable" type="Boolean" mandatory="false">
        <description>value false means disabled, value true means enabled.</description>
    </param>
+   <param name="climateEnable" type="Boolean" mandatory="false">
+   </param>
  </struct>
 
    <struct name="ClimateControlCapabilities">
@@ -2162,6 +2178,12 @@
          True: Available, False: Not Available, Not present: Not Available.
        </description>
    </param>
+   <param name="climateEnableAvailable" type="Boolean" mandatory="false">
+       <description>
+         Availability of the control of enable/disable climate control.
+         True: Available, False: Not Available, Not present: Not Available.
+       </description>
+   </param>
  </struct>
 
  <struct name="EqualizerSettings">
diff --git a/src/components/interfaces/MOBILE_API.xml b/src/components/interfaces/MOBILE_API.xml
index b8276ed123..22596564a6 100644
--- a/src/components/interfaces/MOBILE_API.xml
+++ b/src/components/interfaces/MOBILE_API.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" standalone="no"?>
 <?xml-stylesheet type="text/xml" href="protocol2html.xsl"?>
 
-<interface name="SmartDeviceLink RAPI" version="5.2.0" minVersion="1.0" date="2019-03-19">
+<interface name="SmartDeviceLink RAPI" version="6.0.0" minVersion="1.0" date="2019-03-19">
     <enum name="Result" internal_scope="base" since="1.0">
         <element name="SUCCESS">
             <description>The request succeeded</description>
@@ -3120,16 +3120,21 @@
         <param name="hdRadioEnable" type="Boolean" mandatory="false"  since="5.0">
             <description> True if the hd radio is on, false if the radio is off</description>
         </param>
-        <param name="availableHDs" type="Integer" minvalue="1" maxvalue="7" mandatory="false" since="5.0">
-            <description>number of HD sub-channels if available</description>
+        <param name="availableHDs" type="Integer" minvalue="1" maxvalue="7" mandatory="false" deprecated="true" since="6.0">
+            <description>Number of HD sub-channels if available</description>
             <history>
                 <param name="availableHDs" type="Integer" minvalue="1" maxvalue="3" mandatory="false" since="4.5" until="5.0"/>
+                <param name="availableHDs" type="Integer" minvalue="1" maxvalue="7" mandatory="false" since="5.0" until="6.0"/>
             </history>
         </param>
-        <param name="hdChannel" type="Integer" minvalue="1" maxvalue="7" mandatory="false" since="5.0">
+        <param name="availableHdChannels" type="Integer" minvalue="0" maxvalue="7" array="true" minsize="0" maxsize="8" mandatory="false" since="6.0">
+            <description>The list of available HD sub-channel indexes. Empty list means no Hd channel is available. Read-only. </description>
+        </param>
+        <param name="hdChannel" type="Integer" minvalue="0" maxvalue="7" mandatory="false" since="6.0">
             <description>Current HD sub-channel if available</description>
             <history>
                 <param name="hdChannel" type="Integer" minvalue="1" maxvalue="3" mandatory="false" since="4.5" until="5.0"/>
+                <param name="hdChannel" type="Integer" minvalue="1" maxvalue="7" mandatory="false" since="5.0" until="6.0"/>
             </history>
         </param>
         <param name="signalStrength" type="Integer" minvalue="0" maxvalue="100" mandatory="false">
@@ -3180,6 +3185,8 @@
         <param name="heatedMirrorsEnable" type="Boolean" mandatory="false" since="5.0">
             <description>value false means disabled, value true means enabled.</description>
         </param>
+        <param name="climateEnable" type="Boolean" mandatory="false" since="6.0">
+        </param>
     </struct>
 
     <struct name="RadioControlCapabilities" since="4.5">
@@ -3221,11 +3228,20 @@
                 True: Available, False: Not Available, Not present: Not Available.
             </description>
         </param>
-        <param name="availableHDsAvailable" type="Boolean" mandatory="false">
+        <param name="availableHDsAvailable" type="Boolean" mandatory="false" deprecated="true" since="6.0">
             <description>
                 Availability of the getting the number of available HD channels.
                 True: Available, False: Not Available, Not present: Not Available.
             </description>
+            <history>
+                <param name="availableHDsAvailable" type="Boolean" mandatory="false" since="4.5" until="6.0"/>
+            </history>
+        </param>
+        <param name="availableHdChannelsAvailable" type="Boolean" mandatory="false" since="6.0">
+            <description>
+                Availability of the list of available HD sub-channel indexes.
+                True: Available, False: Not Available, Not present: Not Available.
+            </description>
         </param>
         <param name="stateAvailable" type="Boolean" mandatory="false">
             <description>
@@ -3366,6 +3382,12 @@
                 True: Available, False: Not Available, Not present: Not Available.
             </description>
         </param>
+        <param name="climateEnableAvailable" type="Boolean" mandatory="false" since="6.0">
+            <description>
+                Availability of the control of enable/disable climate control.
+                True: Available, False: Not Available, Not present: Not Available.
+            </description>
+        </param>
     </struct>
 
     <struct name="EqualizerSettings" since="5.0">
@@ -3850,7 +3872,7 @@
                 Audiobook: The total number of sections in the playback queue (e.g. the number of chapters in the book)
             </description>
         </param>
-        <param name="mediaImage" type="Image" mandatory="false" since="5.2">
+        <param name="mediaImage" type="Image" mandatory="false" since="6.0">
           <description>
               Music: The album art of the current track
               Podcast: The podcast or chapter artwork of the current podcast episode
diff --git a/src/components/transport_manager/include/transport_manager/bluetooth/bluetooth_device_scanner.h b/src/components/transport_manager/include/transport_manager/bluetooth/bluetooth_device_scanner.h
index 13fef1d017..768d9ebb54 100644
--- a/src/components/transport_manager/include/transport_manager/bluetooth/bluetooth_device_scanner.h
+++ b/src/components/transport_manager/include/transport_manager/bluetooth/bluetooth_device_scanner.h
@@ -70,6 +70,11 @@ class BluetoothDeviceScanner : public DeviceScanner {
   BluetoothDeviceScanner(TransportAdapterController* controller,
                          bool auto_repeat_search,
                          int repeat_search_pause_sec);
+
+  BluetoothDeviceScanner(TransportAdapterController* controller,
+                         bool auto_repeat_search,
+                         int repeat_search_pause_sec,
+                         const uint8_t* smart_device_link_service_uuid_data);
   /**
    * @brief Destructor.
    */
diff --git a/src/components/transport_manager/src/bluetooth/bluetooth_device_scanner.cc b/src/components/transport_manager/src/bluetooth/bluetooth_device_scanner.cc
index 7e9b4c1332..4759b2003a 100644
--- a/src/components/transport_manager/src/bluetooth/bluetooth_device_scanner.cc
+++ b/src/components/transport_manager/src/bluetooth/bluetooth_device_scanner.cc
@@ -133,7 +133,27 @@ BluetoothDeviceScanner::BluetoothDeviceScanner(
                                                    0xA8};
   sdp_uuid128_create(&smart_device_link_service_uuid_,
                      smart_device_link_service_uuid_data);
-  thread_ = threads::CreateThread("BT Device Scaner",
+  thread_ = threads::CreateThread("BT Device Scanner",
+                                  new BluetoothDeviceScannerDelegate(this));
+}
+
+BluetoothDeviceScanner::BluetoothDeviceScanner(
+    TransportAdapterController* controller,
+    bool auto_repeat_search,
+    int auto_repeat_pause_sec,
+    const uint8_t* smart_device_link_service_uuid_data)
+    : controller_(controller)
+    , thread_(NULL)
+    , shutdown_requested_(false)
+    , ready_(true)
+    , device_scan_requested_(false)
+    , device_scan_requested_lock_()
+    , device_scan_requested_cv_()
+    , auto_repeat_search_(auto_repeat_search)
+    , auto_repeat_pause_sec_(auto_repeat_pause_sec) {
+  sdp_uuid128_create(&smart_device_link_service_uuid_,
+                     smart_device_link_service_uuid_data);
+  thread_ = threads::CreateThread("BT Device Scanner",
                                   new BluetoothDeviceScannerDelegate(this));
 }
 
diff --git a/src/components/transport_manager/src/bluetooth/bluetooth_transport_adapter.cc b/src/components/transport_manager/src/bluetooth/bluetooth_transport_adapter.cc
index 95265cad2e..911658bc56 100644
--- a/src/components/transport_manager/src/bluetooth/bluetooth_transport_adapter.cc
+++ b/src/components/transport_manager/src/bluetooth/bluetooth_transport_adapter.cc
@@ -58,11 +58,12 @@ BluetoothTransportAdapter::~BluetoothTransportAdapter() {}
 
 BluetoothTransportAdapter::BluetoothTransportAdapter(
     resumption::LastState& last_state, const TransportManagerSettings& settings)
-    : TransportAdapterImpl(new BluetoothDeviceScanner(this, true, 0),
-                           new BluetoothConnectionFactory(this),
-                           NULL,
-                           last_state,
-                           settings) {}
+    : TransportAdapterImpl(
+          new BluetoothDeviceScanner(this, true, 0, settings.bluetooth_uuid()),
+          new BluetoothConnectionFactory(this),
+          NULL,
+          last_state,
+          settings) {}
 
 DeviceType BluetoothTransportAdapter::GetDeviceType() const {
   return BLUETOOTH;
diff --git a/src/components/transport_manager/test/transport_manager_default_test.cc b/src/components/transport_manager/test/transport_manager_default_test.cc
index d8bf51ef88..e102458b96 100644
--- a/src/components/transport_manager/test/transport_manager_default_test.cc
+++ b/src/components/transport_manager/test/transport_manager_default_test.cc
@@ -57,6 +57,22 @@ const std::string kTransportManager = "TransportManager";
 const std::string kTcpAdapter = "TcpAdapter";
 const std::string kBluetoothAdapter = "BluetoothAdapter";
 const std::string kDevices = "devices";
+std::vector<uint8_t> kBTUUID = {0x93,
+                                0x6D,
+                                0xA0,
+                                0x1F,
+                                0x9A,
+                                0xBD,
+                                0x4D,
+                                0x9D,
+                                0x80,
+                                0xC7,
+                                0x02,
+                                0xAF,
+                                0x85,
+                                0xC8,
+                                0x22,
+                                0xA8};
 }  // namespace
 
 TEST(TestTransportManagerDefault, Init_LastStateNotUsed) {
@@ -78,6 +94,8 @@ TEST(TestTransportManagerDefault, Init_LastStateNotUsed) {
   EXPECT_CALL(transport_manager_settings,
               transport_manager_tcp_adapter_network_interface())
       .WillRepeatedly(ReturnRef(network_interface));
+  EXPECT_CALL(transport_manager_settings, bluetooth_uuid())
+      .WillRepeatedly(Return(kBTUUID.data()));
 
   transport_manager.Init(mock_last_state);
   transport_manager.Stop();
@@ -114,6 +132,8 @@ TEST(TestTransportManagerDefault, Init_LastStateUsed) {
   EXPECT_CALL(transport_manager_settings,
               transport_manager_tcp_adapter_network_interface())
       .WillRepeatedly(ReturnRef(network_interface));
+  EXPECT_CALL(transport_manager_settings, bluetooth_uuid())
+      .WillRepeatedly(Return(kBTUUID.data()));
   transport_manager.Init(mock_last_state);
   transport_manager.Stop();
 }
@@ -149,6 +169,8 @@ TEST(TestTransportManagerDefault, Init_LastStateUsed_InvalidPort) {
   EXPECT_CALL(transport_manager_settings,
               transport_manager_tcp_adapter_network_interface())
       .WillRepeatedly(ReturnRef(network_interface));
+  EXPECT_CALL(transport_manager_settings, bluetooth_uuid())
+      .WillRepeatedly(Return(kBTUUID.data()));
   transport_manager.Init(mock_last_state);
   transport_manager.Stop();
 }