Merge "Move error delay logic from Manager to Service"