possible MMS Fix from AOSP

Change-Id: I10b7cc427222ca6d0c1b4a514c8a1f5f11898b90
Sms taks

Change-Id: I9b20951c7435112508cc005e5bb80b2b98515146