[Cleanup] Wrap errors by type not by sdkerrors import's Wrapf method.

[Cleanup] Wrap errors by type not by sdkerrors import's Wrapf method. #657