Merge "UserManagerService upgrades users on first restart." into klp-dev