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

Change-Id: I18d5bcf31a6e7f6a4cc691755bd59c12cf2397c8