dlx: SMS/MMS fix

Change-Id: Id7b59d324be0045935ce3675cd8b1e02428f0885
Merge remote tracking branch 'cm10dna/cm-10.1-chad' into jb-4.2

Signed-off-by: travp624 <travp624@gmail.com>