Merge "UserManagerService.hasManagedProfile fix" into tm-dev