diff --git a/battery_mitigation/bcl.mk b/battery_mitigation/bcl.mk
index 09bb5fc..b804a0c 100644
--- a/battery_mitigation/bcl.mk
+++ b/battery_mitigation/bcl.mk
@@ -2,3 +2,5 @@ PRODUCT_PACKAGES += battery_mitigation
 
 BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/battery_mitigation/sepolicy
 PRODUCT_SOONG_NAMESPACES += device/google/gs-common/battery_mitigation
+
+# BetterBug is included in /vendor/google/products/pixel_experience_2017_and_newer.mk
diff --git a/battery_mitigation/sepolicy/better_bug_app.te b/battery_mitigation/sepolicy/better_bug_app.te
new file mode 100644
index 0000000..506e832
--- /dev/null
+++ b/battery_mitigation/sepolicy/better_bug_app.te
@@ -0,0 +1,11 @@
+type better_bug_app, domain, coredomain;
+
+userdebug_or_eng(`
+  app_domain(better_bug_app)
+  net_domain(better_bug_app)
+  allow better_bug_app app_api_service:service_manager find;
+  allow better_bug_app system_api_service:service_manager find;
+  allow better_bug_app privapp_data_file:file execute;
+  get_prop(better_bug_app, default_prop);
+  get_prop(better_bug_app, vendor_startup_bugreport_requested_prop)
+')
diff --git a/battery_mitigation/sepolicy/seapp_contexts b/battery_mitigation/sepolicy/seapp_contexts
new file mode 100644
index 0000000..14bf1d2
--- /dev/null
+++ b/battery_mitigation/sepolicy/seapp_contexts
@@ -0,0 +1,3 @@
+# BetterBug
+user=_app isPrivApp=true name=com.google.android.apps.internal.betterbug domain=better_bug_app type=app_data_file levelFrom=all
+
diff --git a/battery_mitigation/sepolicy/vendor_init.te b/battery_mitigation/sepolicy/vendor_init.te
new file mode 100644
index 0000000..1c7f90b
--- /dev/null
+++ b/battery_mitigation/sepolicy/vendor_init.te
@@ -0,0 +1,2 @@
+# Battery Mitigation
+set_prop(vendor_init, vendor_startup_bugreport_requested_prop)