Merge "Replace no error code '0' for SMS with '-1'"