Merge "Remove unnecessary userid check" into jb-mr2-dev