Merge "Fix issue #25357209: Could not send SMS or MMS messages, had to reboot"...
Merge "Fix issue #25357209: Could not send SMS or MMS messages, had to reboot" into mnc-dr-dev am: 71e49845 am: 9a13cc69
am: a09ac2d9
* commit 'a09ac2d9':
Fix issue #25357209: Could not send SMS or MMS messages, had to reboot