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

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