Merge "Settings db upgrade steps only apply to the owner user" into jb-mr1-dev