Merge branch 'tizen' into security-manager

Change-Id: I2182b5350daefac56746a1d8ee56f9e871608c94

diff --cc src/security-manager-tests/test_cases_prepare_app.cpp
index 1f69117f918a540f1fb44f59dcaf664c844ed37c,3cb2b2e59b7096ff4dd27ed750d325a99167efd0..27e36e6d5a0e20b7df000805c568c818b95509fe
--- 1/src/security-manager-tests/test_cases_prepare_app.cpp
--- 2/src/security-manager-tests/test_cases_prepare_app.cpp
+++ b/src/security-manager-tests/test_cases_prepare_app.cpp
@@@ -26,7 -26,7 +26,8 @@@
  #include <memory>
  #include <mutex>
  #include <fstream>
 +#include <chrono>
+ #include <atomic>
  
  #include <dpl/test/test_runner_child.h>
  #include <dpl/test/test_runner.h>