Merge "ServiceManager: Internal renames"