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