am de73afe2: Merge "Make MmsServiceBroker more robust to MmsService crashes" into lmp-dev

* commit 'de73afe268bd7979017ae4b9481fc1ebf5df6c19':
  Make MmsServiceBroker more robust to MmsService crashes