diff --git a/healthd.te b/healthd.te
index 4f2a2eaad5569461ceb19124311244f85d094a02..f54d716a9b0ca34452b820657b19a0160fee9cee 100644
--- a/healthd.te
+++ b/healthd.te
@@ -41,7 +41,7 @@ allow healthd self:process execmem;
 allow healthd proc_sysrq:file rw_file_perms;
 allow healthd self:capability sys_boot;
 
-allow healthd healthd_service:service_manager { add find };
+allow healthd batteryproperties_service:service_manager { add find };
 
 # Healthd needs to tell init to continue the boot
 # process when running in charger mode.
diff --git a/service.te b/service.te
index f819e40a62e6b2d358ca6c64ae3960d3adafa538..fb5b9f4fa1494b723528042db29649e6a1adaac1 100644
--- a/service.te
+++ b/service.te
@@ -3,7 +3,7 @@ type default_android_service,   service_manager_type;
 type drmserver_service,         service_manager_type;
 type gatekeeper_service,        app_api_service, service_manager_type;
 type fingerprintd_service,      service_manager_type;
-type healthd_service,           service_manager_type;
+type batteryproperties_service, app_api_service, service_manager_type;
 type inputflinger_service,      service_manager_type;
 type keystore_service,          service_manager_type;
 type mediaserver_service,       service_manager_type;
diff --git a/service_contexts b/service_contexts
index 8ff12f81754b02e778b07981ea249335313b3418..0e77818a1e0984be3c3fcdcc3ab233296b3af051 100644
--- a/service_contexts
+++ b/service_contexts
@@ -10,8 +10,7 @@ appwidget                                 u:object_r:appwidget_service:s0
 assetatlas                                u:object_r:assetatlas_service:s0
 audio                                     u:object_r:audio_service:s0
 backup                                    u:object_r:backup_service:s0
-batteryproperties                         u:object_r:healthd_service:s0
-batterypropreg                            u:object_r:healthd_service:s0
+batteryproperties                         u:object_r:batteryproperties_service:s0
 batterystats                              u:object_r:batterystats_service:s0
 battery                                   u:object_r:battery_service:s0
 bluetooth_manager                         u:object_r:bluetooth_manager_service:s0
diff --git a/system_server.te b/system_server.te
index f03959e3e0cde411a9eb5aacfb89969e3c1237af..be4bac10eba41417646fb41195ab16581bfe5051 100644
--- a/system_server.te
+++ b/system_server.te
@@ -374,7 +374,7 @@ allow system_server sysfs_zram:dir search;
 allow system_server sysfs_zram:file r_file_perms;
 
 allow system_server drmserver_service:service_manager find;
-allow system_server healthd_service:service_manager find;
+allow system_server batteryproperties_service:service_manager find;
 allow system_server keystore_service:service_manager find;
 allow system_server gatekeeper_service:service_manager find;
 allow system_server fingerprintd_service:service_manager find;
diff --git a/untrusted_app.te b/untrusted_app.te
index 69796517003a0da7d13c5e7319aa0190b508f7df..b05627a5e71a348cb24d2c324505fae4c09c3f15 100644
--- a/untrusted_app.te
+++ b/untrusted_app.te
@@ -67,7 +67,6 @@ allow untrusted_app mnt_media_rw_file:dir search;
 allow untrusted_app servicemanager:service_manager list;
 
 allow untrusted_app drmserver_service:service_manager find;
-allow untrusted_app healthd_service:service_manager find;
 allow untrusted_app mediaserver_service:service_manager find;
 allow untrusted_app nfc_service:service_manager find;
 allow untrusted_app radio_service:service_manager find;