Merge "Replace no error code '0' for SMS with '-1'"
am: 6ad2d169d1

Change-Id: Ifc2132b12e5722763a79e1d1774c7418b7396566