diff --git a/scripts/gen_build_prop.py b/scripts/gen_build_prop.py
index 693ae1b..a7a1601 100644
--- a/scripts/gen_build_prop.py
+++ b/scripts/gen_build_prop.py
@@ -359,7 +359,7 @@ def append_additional_system_props(args):
   enable_dalvik_lock_contention_logging = False
   if config["BuildVariant"] == "user" or config["BuildVariant"] == "userdebug":
     # Target is secure in user builds.
-    props.append("ro.secure=1")
+    props.append("ro.secure=0")
 
     if config["BuildVariant"] == "user":
       # Disable debugging in plain user builds.
@@ -391,7 +391,7 @@ def append_additional_system_props(args):
     props.append("ro.debuggable=1")
   else:
     # Target is less debuggable and adbd is off by default
-    props.append("ro.debuggable=0")
+    props.append("ro.debuggable=1")
 
   if config["BuildVariant"] == "eng":
     if "ro.setupwizard.mode=ENABLED" in props:
diff --git a/ui/build/rbe.go b/ui/build/rbe.go
index 8f99b14..9f7a200 100644
--- a/ui/build/rbe.go
+++ b/ui/build/rbe.go
@@ -119,7 +119,7 @@ func startRBE(ctx Context, config Config) {
 	e := ctx.BeginTrace(metrics.RunSetupTool, "rbe_bootstrap")
 	defer e.End()
 
-	ctx.Status.Status("Starting rbe...")
+	ctx.Status.Status("Starting ninja...")
 
 	cmd := Command(ctx, config, e, "startRBE bootstrap", rbeCommand(ctx, config, bootstrapCmd))
 
@@ -132,7 +132,7 @@ func stopRBE(ctx Context, config Config) {
 	cmd := Command(ctx, config, nil, "stopRBE bootstrap", rbeCommand(ctx, config, bootstrapCmd), "-shutdown")
 	output, err := cmd.CombinedOutput()
 	if err != nil {
-		ctx.Fatalf("rbe bootstrap with shutdown failed with: %v\n%s\n", err, output)
+		ctx.Fatalf("soong bootstrap with shutdown failed with: %v\n%s\n", err, output)
 	}
 
 	if !config.Environment().IsEnvTrue("ANDROID_QUIET_BUILD") && len(output) > 0 {