Merge "Fix the user name for the owner." into jb-mr1-dev