diff --git a/Android.bp b/Android.bp
index 00774da..b60e265 100755
--- a/Android.bp
+++ b/Android.bp
@@ -4,7 +4,7 @@ subdirs = [
 
 hidl_package_root {
     name: "vendor.qti.hardware.radio.am",
-    path: "packages/apps/QcRilAm/interface/am",
+    path: "vendor/oss/qcrilam/interface/am",
 }
 
 android_app {
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 97bfe50..4170f92 100755
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2,6 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.sony.qcrilam"
     coreApp="true"
+    android:sharedUserId="android.uid.system"
     android:versionCode="1"
     android:versionName="1.0" >
 
diff --git a/src/com/sony/qcrilam/QcRilAmService.kt b/src/com/sony/qcrilam/QcRilAmService.kt
index 30fc48c..f507411 100644
--- a/src/com/sony/qcrilam/QcRilAmService.kt
+++ b/src/com/sony/qcrilam/QcRilAmService.kt
@@ -35,7 +35,7 @@ private const val TAG = "QcRilAm-Service"
 class QcRilAmService : Service() {
     private fun addCallbackForSimSlot(simSlotNo: Int, audioManager: AudioManager) {
         try {
-            val qcRilAudio = IQcRilAudio.getService("slot$simSlotNo", true /*retry*/)
+            val qcRilAudio = IQcRilAudio.getService("slot$simSlotNo")
             if (qcRilAudio == null) {
                 Log.e(TAG, "Could not get service instance for slot$simSlotNo, failing")
             } else {