diff --git a/file_contexts b/file_contexts
index 0192ea3cdbd267fcd8b1ef906f574f3fb60d5214..e78f8b8f7b80491e2096544cfdee2c6e2426bf6b 100644
--- a/file_contexts
+++ b/file_contexts
@@ -29,6 +29,7 @@
 /sys                u:object_r:sysfs:s0
 
 # Symlinks
+/bugreports         u:object_r:rootfs:s0
 /d                  u:object_r:rootfs:s0
 /etc                u:object_r:rootfs:s0
 /sdcard             u:object_r:rootfs:s0
diff --git a/system_server.te b/system_server.te
index e74f58cebe7fe6eb7898e56d27abcd9ff8077e60..558770ba2bb6c5e2b110e2263322735ecae9ccef 100644
--- a/system_server.te
+++ b/system_server.te
@@ -54,16 +54,13 @@ allow system_server self:capability {
     net_raw
     sys_boot
     sys_nice
-    sys_resource
+    sys_ptrace
     sys_time
     sys_tty_config
 };
 
 wakelock_use(system_server)
 
-# Triggered by /proc/pid accesses, not allowed.
-dontaudit system_server self:capability sys_ptrace;
-
 # Trigger module auto-load.
 allow system_server kernel:system module_request;