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

* commit 'acddb72c58dbab029d1acbaea61755e79ef8b2a4':
  Make sure that the owner user is marked initialized.