possible MMS Fix from AOSP

Change-Id: I10b7cc427222ca6d0c1b4a514c8a1f5f11898b90
Merge "possible MMS Fix from AOSP" into du44