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

Change-Id: I1d6ea8dbc57f73cdb0c98ddef737dae7d6017f4e