Merge "Replace no error code '0' for SMS with '-1'" am: b7f93e6f10
am: 22d93c0406

Change-Id: Iea7391e23e36fd7a9d7c449457f46743315458c3