am 81d2676f: am 49c9c9f2: Merge "Persist SMS messages sent by other than the...
am 81d2676f: am 49c9c9f2: Merge "Persist SMS messages sent by other than the default SMS app" into klp-dev
* commit '81d2676f':
Persist SMS messages sent by other than the default SMS app