diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts
index 8985b5cb..76114782 100644
--- a/sepolicy/file_contexts
+++ b/sepolicy/file_contexts
@@ -23,7 +23,6 @@
 /sys/block/mmcblk.*/queue/scheduler  --    u:object_r:sysfs_devices_system_iosched:s0
 
 /data/hostapd(/.*)?         u:object_r:wifi_data_file:s0
-/data/misc/radio(/.*)?      u:object_r:radio_data_file:s0
 
 #############
 # Superuser's control sockets
diff --git a/sepolicy/service.te b/sepolicy/service.te
new file mode 100644
index 00000000..8a7a425e
--- /dev/null
+++ b/sepolicy/service.te
@@ -0,0 +1,10 @@
+type edge_gesture_service, system_api_service, system_server_service, service_manager_type;
+type themes_service, system_api_service, system_server_service, service_manager_type;
+type torch_service, system_api_service, system_server_service, service_manager_type;
+type kill_switch_service, system_api_service, system_server_service, service_manager_type;
+type cm_status_bar_service, system_api_service, system_server_service, service_manager_type;
+type cm_profile_service, system_api_service, system_server_service, service_manager_type;
+type cm_partner_interface, system_api_service, system_server_service, service_manager_type;
+type cm_telephony_service, system_api_service, system_server_service, service_manager_type;
+type cm_hardware_service, system_api_service, system_server_service, service_manager_type;
+type cm_app_suggest_service, system_api_service, system_server_service, service_manager_type;
diff --git a/sepolicy/service_contexts b/sepolicy/service_contexts
index eea1d811..324b13de 100644
--- a/sepolicy/service_contexts
+++ b/sepolicy/service_contexts
@@ -1,11 +1,10 @@
-cmhw                                      u:object_r:system_server_service:s0
-edgegestureservice                        u:object_r:system_server_service:s0
-themes                                    u:object_r:system_server_service:s0
-torch                                     u:object_r:system_server_service:s0
-killswitch                                u:object_r:system_server_service:s0
-cmstatusbar                               u:object_r:system_server_service:s0
-profile                                   u:object_r:system_server_service:s0
-cmpartnerinterface                        u:object_r:system_server_service:s0
-cmtelephonymanager                        u:object_r:system_server_service:s0
-cmhardware                                u:object_r:system_server_service:s0
-cmappsuggest                              u:object_r:system_server_service:s0
+edgegestureservice                        u:object_r:edge_gesture_service:s0
+themes                                    u:object_r:themes_service:s0
+torch                                     u:object_r:torch_service:s0
+killswitch                                u:object_r:kill_switch_service:s0
+cmstatusbar                               u:object_r:cm_status_bar_service:s0
+profile                                   u:object_r:cm_profile_service:s0
+cmpartnerinterface                        u:object_r:cm_partner_interface:s0
+cmtelephonymanager                        u:object_r:cm_telephony_service:s0
+cmhardware                                u:object_r:cm_hardware_service:s0
+cmappsuggest                              u:object_r:cm_app_suggest_service:s0