diff --git a/audio/sepolicy/common/property_contexts b/audio/sepolicy/common/property_contexts
index 96e678c..9f88e55 100644
--- a/audio/sepolicy/common/property_contexts
+++ b/audio/sepolicy/common/property_contexts
@@ -1,3 +1,6 @@
+# for serial no
+vendor.audio_hal.device.serialno                u:object_r:vendor_audio_prop:s0
+
 # for audio
 vendor.audio_hal.period_multiplier              u:object_r:vendor_audio_prop:s0
 vendor.audiodump.enable                         u:object_r:vendor_audio_prop:s0
diff --git a/power/Android.bp b/power/Android.bp
new file mode 100644
index 0000000..b70372c
--- /dev/null
+++ b/power/Android.bp
@@ -0,0 +1,10 @@
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+prebuilt_etc {
+    name: "init.power-gs.rc",
+    src: "init.power-gs.rc",
+    vendor: true,
+    sub_dir: "init",
+}
diff --git a/power/OWNERS b/power/OWNERS
new file mode 100644
index 0000000..09c47ea
--- /dev/null
+++ b/power/OWNERS
@@ -0,0 +1,5 @@
+joaodias@google.com
+frankvarela@google.com
+krossmo@google.com
+cozette@google.com
+dennisyee@google.com
diff --git a/power/init.power-gs.rc b/power/init.power-gs.rc
new file mode 100644
index 0000000..03748a2
--- /dev/null
+++ b/power/init.power-gs.rc
@@ -0,0 +1,3 @@
+on property:sys.boot_completed=1
+    # Reduce pm_freeze_timeout value
+    write /sys/power/pm_freeze_timeout 1000
diff --git a/power/power.mk b/power/power.mk
new file mode 100644
index 0000000..336cd96
--- /dev/null
+++ b/power/power.mk
@@ -0,0 +1 @@
+PRODUCT_PACKAGES += init.power-gs.rc