am 345d491b: Merge "Implement new method for handling SMS/MMS on the platform" into klp-dev

* commit '345d491b77d70942f7a4390645fae7748b418459':
  Implement new method for handling SMS/MMS on the platform