Merge "Use console=ttynull to disable console"
diff --git a/microdroid/bootconfig.app_debuggable b/microdroid/bootconfig.app_debuggable
index 6e66371..529ed07 100644
--- a/microdroid/bootconfig.app_debuggable
+++ b/microdroid/bootconfig.app_debuggable
@@ -7,9 +7,8 @@
androidboot.microdroid.debuggable=0
# Console output is not redirect to the host-side.
-# TODO(b/219743539) This doesn't successfully disable the console
kernel.printk.devkmsg=off
-kernel.console=null
+kernel.console=ttynull
# ADB is supported but rooting is prohibited.
androidboot.adb.enabled=1
diff --git a/microdroid/bootconfig.normal b/microdroid/bootconfig.normal
index ec85f0d..5cc553c 100644
--- a/microdroid/bootconfig.normal
+++ b/microdroid/bootconfig.normal
@@ -5,10 +5,8 @@
androidboot.microdroid.debuggable=0
# Console output is not redirect to the host-side.
-# TODO(b/219743539) This doesn't successfully disable the console
kernel.printk.devkmsg=off
-# TODO(b/219743539) Setting this to null makes everything slow
-kernel.console=hvc0
+kernel.console=ttynull
# ADB is not enabled.
androidboot.adb.enabled=0