Merge commit '9eb556804ae753b6fabc66329952dae596f378b7' into manual_merge_27cdeb9

Change-Id: I71046e0f0c4bfb24fc7ddf32a45e515d6cb21b24

diff --cc btif/src/btif_config.cc
index 722d6a6,eceb964..8e061b8
--- 1/btif/src/btif_config.cc
--- 2/btif/src/btif_config.c
+++ b/btif/src/btif_config.cc
@@@ -158,11 -165,11 +158,11 @@@ static future_t *init(void) 
      file_source = "Empty";
    }
  
-   if (!file_source.empty())
-     config_set_string(config, INFO_SECTION, FILE_SOURCE, file_source.c_str());
+   if (file_source != NULL)
+     config_set_string(config, INFO_SECTION, FILE_SOURCE, file_source);
  
    if (!config) {
 -    LOG_ERROR("%s unable to allocate a config object.", __func__);
 +    LOG_ERROR(LOG_TAG, "%s unable to allocate a config object.", __func__);
      goto error;
    }