Merge commit '0c6abc9dc5baa5d7f1a09df1ae82b2954e0f7285' into HEAD

Change-Id: Iabab445a7f748c62770d76a9f596117d0e32609a
diff --git a/gatekeeper_messages.cpp b/gatekeeper_messages.cpp
index 41972bb..d6d028d 100644
--- a/gatekeeper_messages.cpp
+++ b/gatekeeper_messages.cpp
@@ -19,8 +19,6 @@
 
 #include <string.h>
 
-using namespace std;
-
 namespace gatekeeper {
 
 /**