Merge "Do not populate `ro.kernel.qemu` in `ProcessKernelCmdline`"
diff --git a/init/property_service.cpp b/init/property_service.cpp
index 382f430..27ace7d 100644
--- a/init/property_service.cpp
+++ b/init/property_service.cpp
@@ -1172,7 +1172,8 @@
         } else if (StartsWith(key, "qemu."sv)) {
             InitPropertySet("ro.kernel." + key, value);
         } else if (key == "qemu") {
-            InitPropertySet("ro.kernel." + key, value);  // emulator specific, deprecated
+            // emulator specific, should be retired once emulator migrates to
+            // androidboot.
             InitPropertySet("ro.boot." + key, value);
         }
     });