diff --git a/modem/Android.bp b/modem/Android.bp
new file mode 100644
index 0000000..0376ca6
--- /dev/null
+++ b/modem/Android.bp
@@ -0,0 +1,10 @@
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+sh_binary {
+    name: "dump_modem.sh",
+    src: "dump_modem.sh",
+    vendor: true,
+    sub_dir: "dump",
+}
diff --git a/modem/dump_modem.sh b/modem/dump_modem.sh
new file mode 100644
index 0000000..f9f7cf2
--- /dev/null
+++ b/modem/dump_modem.sh
@@ -0,0 +1,17 @@
+#!/vendor/bin/sh
+
+echo "------ Modem Stat ------"
+cat /data/vendor/modem_stat/debug.txt
+
+echo "\n------ Modem SSR history ------"
+for f in $(ls /data/vendor/ssrdump/crashinfo_modem*); do
+  echo $f
+  cat $f
+done
+
+echo "\n------ RFSD error log ------"
+for f in $(ls /data/vendor/log/rfsd/rfslog_*); do
+  echo $f
+  cat $f
+done
+
diff --git a/modem/modem.mk b/modem/modem.mk
new file mode 100644
index 0000000..fe4633d
--- /dev/null
+++ b/modem/modem.mk
@@ -0,0 +1,3 @@
+BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/modem/sepolicy
+
+PRODUCT_PACKAGES += dump_modem.sh
diff --git a/modem/sepolicy/dump_modem.te b/modem/sepolicy/dump_modem.te
new file mode 100644
index 0000000..dc9b38d
--- /dev/null
+++ b/modem/sepolicy/dump_modem.te
@@ -0,0 +1,10 @@
+pixel_bugreport(dump_modem)
+
+allow dump_modem modem_stat_data_file:dir search;
+allow dump_modem modem_stat_data_file:file r_file_perms;
+allow dump_modem sscoredump_vendor_data_crashinfo_file:dir r_dir_perms;
+allow dump_modem sscoredump_vendor_data_crashinfo_file:file r_file_perms;
+allow dump_modem vendor_log_file:dir search;
+allow dump_modem vendor_rfsd_log_file:dir r_dir_perms;
+allow dump_modem vendor_rfsd_log_file:file r_file_perms;
+allow dump_modem vendor_toolbox_exec:file execute_no_trans;
diff --git a/modem/sepolicy/file_contexts b/modem/sepolicy/file_contexts
new file mode 100644
index 0000000..d7f6be5
--- /dev/null
+++ b/modem/sepolicy/file_contexts
@@ -0,0 +1 @@
+/vendor/bin/dump/dump_modem\.sh      u:object_r:dump_modem_exec:s0