Switch some more Steps to builder.msg
#113034
+20
−16
Merged