diff --git a/conf/init.gs201.rc b/conf/init.gs201.rc
index c607fca6..f4bc6eac 100644
--- a/conf/init.gs201.rc
+++ b/conf/init.gs201.rc
@@ -848,6 +848,7 @@ service init_display /vendor/bin/init.display.sh
 # bugreport is triggered by holding down volume down, volume up and power
 service bugreport /system/bin/dumpstate -d -p -z
     class main
+    user root
     disabled
     oneshot
     keycodes 114 115 116
diff --git a/default-permissions.xml b/default-permissions.xml
index a6476338..ecdbaf01 100644
--- a/default-permissions.xml
+++ b/default-permissions.xml
@@ -50,7 +50,6 @@
         <!-- Camera -->
         <permission name="android.permission.CAMERA" fixed="false"/>
         <!-- Camera Connectivity -->
-        <permission name="android.permission.ACCESS_FINE_LOCATION" fixed="false"/>
         <permission name="android.permission.POST_NOTIFICATIONS" fixed="false"/>
         <permission name="android.permission.BLUETOOTH_CONNECT" fixed="false"/>
         <permission name="android.permission.BLUETOOTH_SCAN" fixed="false"/>
diff --git a/device.mk b/device.mk
index d291af4c..637d49ac 100644
--- a/device.mk
+++ b/device.mk
@@ -911,6 +911,7 @@ endif
 # Exynos RIL and telephony
 # Multi SIM(DSDS)
 SIM_COUNT := 2
+$(call soong_config_set,sim,sim_count,$(SIM_COUNT))
 SUPPORT_MULTI_SIM := true
 # Support NR
 SUPPORT_NR := true