Merge "Make sure that the owner user is marked initialized." into jb-mr1.1-dev