Merge "Change name of the fake service manager"