diff --git a/vendor/google/file_contexts b/vendor/google/file_contexts
index c5a0e9e..115ab75 100644
--- a/vendor/google/file_contexts
+++ b/vendor/google/file_contexts
@@ -28,6 +28,7 @@
 /vendor/bin/hw/android\.hardware\.authsecret@1\.0-service\.citadel                    u:object_r:hal_authsecret_citadel_exec:s0
 /vendor/bin/hw/android\.hardware\.biometrics\.face@1\.0-service\.google               u:object_r:hal_face_default_exec:s0
 /vendor/bin/hw/android\.hardware\.camera\.provider@2\.4-service-google                u:object_r:hal_camera_default_exec:s0
+/vendor/bin/hw/android\.hardware\.contexthub@1\.1-service\.generic                    u:object_r:hal_contexthub_default_exec:s0
 /vendor/bin/hw/android\.hardware\.keymaster@4\.0-service\.citadel                     u:object_r:hal_keymaster_citadel_exec:s0
 /vendor/bin/hw/android\.hardware\.neuralnetworks@1\.2-service-noronha                 u:object_r:hal_neuralnetworks_darwinn_exec:s0
 /vendor/bin/hw/android\.hardware\.oemlock@1\.0-service\.citadel                       u:object_r:hal_oemlock_citadel_exec:s0
@@ -42,7 +43,7 @@
 /vendor/bin/hw/init_citadel                                                           u:object_r:init_citadel_exec:s0
 /vendor/bin/hw/citadel_updater                                                        u:object_r:citadel_updater_exec:s0
 /vendor/bin/CitadelProvision                                                          u:object_r:citadel_provision_exec:s0
-/vendor/bin/hw/hardware\.google\.light@1\.0-service                                   u:object_r:hal_light_default_exec:s0
+/vendor/bin/hw/hardware\.google\.light@1\.1-service                                   u:object_r:hal_light_default_exec:s0
 /vendor/bin/hw/vendor\.google\.airbrush@1\.0-service                                  u:object_r:airbrush_exec:s0
 /vendor/bin/hw/vendor\.google\.radioext@1\.0-service                                  u:object_r:hal_radioext_default_exec:s0
 /vendor/bin/hw/wait_for_strongbox                                                     u:object_r:wait_for_strongbox_exec:s0
@@ -59,7 +60,7 @@
 /vendor/bin/init\.radio\.sh                                                           u:object_r:init_radio_exec:s0
 /vendor/bin/hw/vendor\.google\.wifi_ext@1\.0-service-vendor                           u:object_r:hal_wifi_ext_exec:s0
 /vendor/bin/tcpdump_logger                                                            u:object_r:tcpdump_logger_exec:s0
-/vendor/bin/hw/vendor\.google\.wireless_charger@1\.0-service-vendor                   u:object_r:hal_wlc_exec:s0
+/vendor/bin/hw/vendor\.google\.wireless_charger@1\.1-service-vendor                   u:object_r:hal_wlc_exec:s0
 /vendor/bin/hw/android\.hardware\.graphics\.composer@2\.3-service-sm8150              u:object_r:hal_graphics_composer_default_exec:s0
 /vendor/bin/hw/init_dp.sh                                                             u:object_r:init_dp_exec:s0
 
diff --git a/vendor/qcom/common/hal_contexthub.te b/vendor/google/hal_contexthub.te
similarity index 100%
rename from vendor/qcom/common/hal_contexthub.te
rename to vendor/google/hal_contexthub.te
diff --git a/vendor/google/refreshrate_app.te b/vendor/google/refreshrate_app.te
index a0af245..c747bbf 100644
--- a/vendor/google/refreshrate_app.te
+++ b/vendor/google/refreshrate_app.te
@@ -1,11 +1,11 @@
 type refreshrate_app, domain;
 
 app_domain(refreshrate_app);
+hal_client_domain(refreshrate_app, hal_light)
 
 # Standard system services
 allow refreshrate_app app_api_service:service_manager find;
 allow refreshrate_app surfaceflinger_service:service_manager find;
 
 binder_call(refreshrate_app, gpuservice)
-
 set_prop(refreshrate_app, vendor_display_prop);
diff --git a/vendor/qcom/common/hal_bluetooth_default.te b/vendor/qcom/common/hal_bluetooth_default.te
index 6f1cb38..2b08fd4 100644
--- a/vendor/qcom/common/hal_bluetooth_default.te
+++ b/vendor/qcom/common/hal_bluetooth_default.te
@@ -5,7 +5,7 @@
 userdebug_or_eng(`
   allow hal_bluetooth_default diag_device:chr_file rw_file_perms;
   allow hal_bluetooth_default ramdump_vendor_data_file:dir rw_dir_perms;
-  allow hal_bluetooth_default ramdump_vendor_data_file:file { create w_file_perms };
+  allow hal_bluetooth_default ramdump_vendor_data_file:file { create rw_file_perms };
   r_dir_file(hal_bluetooth_default, debugfs_ipc)
   set_prop(hal_bluetooth_default, vendor_ssr_prop)
 ')
diff --git a/vendor/qcom/common/hal_gnss_qti.te b/vendor/qcom/common/hal_gnss_qti.te
index a09b551..d9675cd 100644
--- a/vendor/qcom/common/hal_gnss_qti.te
+++ b/vendor/qcom/common/hal_gnss_qti.te
@@ -25,3 +25,6 @@
 allow hal_gnss_qti location:unix_dgram_socket sendto;
 
 allow hal_gnss_qti self:qipcrtr_socket create_socket_perms_no_ioctl;
+
+# Allow Gnss HAL to get updates from health hal
+hal_client_domain(hal_gnss_qti, hal_health)
diff --git a/vendor/qcom/common/hal_sensors_default.te b/vendor/qcom/common/hal_sensors_default.te
index ef5662e..084992e 100644
--- a/vendor/qcom/common/hal_sensors_default.te
+++ b/vendor/qcom/common/hal_sensors_default.te
@@ -39,6 +39,7 @@
 
 # For Suez metrics collection
 allow hal_sensors_default fwk_stats_hwservice:hwservice_manager find;
+allow hal_sensors_default system_server:binder call;
 
 dontaudit hal_sensors_default kernel:system module_request;
 dontaudit hal_sensors_default sysfs_esoc:dir r_dir_perms;