diff --git a/build/soong/compat_cil.go b/build/soong/compat_cil.go
index 5cc73f9..230fdc3 100644
--- a/build/soong/compat_cil.go
+++ b/build/soong/compat_cil.go
@@ -87,15 +87,6 @@
 
 	srcPaths := c.expandSeSources(ctx)
 	out := android.PathForModuleGen(ctx, c.Name())
-
-	// TODO(b/183362912): Patch secilc to handle empty cil files.
-	// Put a header so that the generated cil mustn't be empty.
-	header := android.PathForModuleGen(ctx, c.Name()+"_header")
-	rule := android.NewRuleBuilder(pctx, ctx)
-	rule.Command().Text("echo").Flag(proptools.ShellEscape(";; " + c.stem())).Text(">").Output(header)
-	rule.Build(c.Name()+"_header", "Generate cil header")
-	srcPaths = append(android.Paths{header}, srcPaths...)
-
 	ctx.Build(pctx, android.BuildParams{
 		Rule:        android.Cat,
 		Inputs:      srcPaths,
diff --git a/private/property_contexts b/private/property_contexts
index 5d1f117..5af4bb7 100644
--- a/private/property_contexts
+++ b/private/property_contexts
@@ -312,8 +312,9 @@
 audio.offload.video             u:object_r:audio_config_prop:s0 exact bool
 audio.offload.min.duration.secs u:object_r:audio_config_prop:s0 exact int
 
-ro.audio.ignore_effects  u:object_r:audio_config_prop:s0 exact bool
-ro.audio.monitorRotation u:object_r:audio_config_prop:s0 exact bool
+ro.audio.ignore_effects   u:object_r:audio_config_prop:s0 exact bool
+ro.audio.monitorRotation  u:object_r:audio_config_prop:s0 exact bool
+ro.audio.offload_wakelock u:object_r:audio_config_prop:s0 exact bool
 
 persist.config.calibration_fac u:object_r:camera_calibration_prop:s0 exact string
 
diff --git a/private/system_server.te b/private/system_server.te
index dcccc5e..c9f3f8e 100644
--- a/private/system_server.te
+++ b/private/system_server.te
@@ -319,6 +319,7 @@
   drmserver
   gpuservice
   inputflinger
+  keystore
   mediadrmserver
   mediaextractor
   mediametrics