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

Change-Id: I8958cc554cdcef637e97df28a973c095b11b03af