diff --git a/.gitupstream b/.gitupstream
new file mode 100644
index 0000000..9daa8c8
--- /dev/null
+++ b/.gitupstream
@@ -0,0 +1 @@
+https://git.codelinaro.org/clo/la/platform/vendor/qcom-opensource/data-ipa-cfg-mgr
diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..9515b25
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,2 @@
+soong_namespace {
+}
diff --git a/ipacm/Android.bp b/ipacm/Android.bp
index 0ce21f7..a925c5d 100644
--- a/ipacm/Android.bp
+++ b/ipacm/Android.bp
@@ -5,7 +5,7 @@
     local_include_dirs: ["src"] + ["inc"],
 	header_libs: ["qti_kernel_headers"],
 
-    cflags: ["-v"] + ["-DFEATURE_IPA_ANDROID"] + ["-DFEATURE_IPACM_RESTART"] + [
+    cflags: ["-DFEATURE_IPA_ANDROID"] + ["-DFEATURE_IPACM_RESTART"] + [
         "-DFEATURE_IPACM_HAL",
 	"-DDEBUG",
         "-Wall",
diff --git a/ipacm/src/ipacm.rc b/ipacm/src/ipacm.rc
index 6b3bf98..78b3340 100644
--- a/ipacm/src/ipacm.rc
+++ b/ipacm/src/ipacm.rc
@@ -30,5 +30,8 @@
     user radio
     group radio inet
 
+# msm specific files that need to be created on /data
 on post-fs-data
+    mkdir /data/vendor/ipa 0770 radio radio
+    chmod 0770 /data/vendor/ipa
     start vendor.ipacm
diff --git a/ipanat/test/Android.mk b/ipanat/test/Android.mk
index b8ae6a4..ae4e1f0 100644
--- a/ipanat/test/Android.mk
+++ b/ipanat/test/Android.mk
@@ -42,7 +42,7 @@
 
 LOCAL_SHARED_LIBRARIES := libipanat
 
-LOCAL_MODULE_TAGS := debug
+LOCAL_MODULE_TAGS := tests
 LOCAL_MODULE_PATH := $(TARGET_OUT_DATA)/kernel-tests/ip_accelerator
 
 include $(BUILD_EXECUTABLE)