Merge "Fix defaultServiceManager() locking and retry loop."