Merge "clean up USER_OWNER in Pm command"