Merge "Move servicemanager into system-background cpuset." into nyc-dev