Merge "Refactor SystemServiceManager.xxxUser() methods."