Merge "Clean up USER_OWNER reference in cmds."