Merge "Fix build due to change in SystemServiceManager"