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

Change-Id: Ie3a7cf3f1692be15de61b79f67e1291bc39a15be