am cf680fed: am 63068219: Merge "Change to make sure InboundSmsHandler stm...
am cf680fed: am 63068219: Merge "Change to make sure InboundSmsHandler stm gets out of DeliveringState" into mnc-dev
* commit 'cf680fed':
Change to make sure InboundSmsHandler stm gets out of DeliveringState