am c4673b8c: am 1ab460d2: am 1e05c8a2: am fc6db072: Merge "Cleanup of timeout handling and message" into mnc-dr-dev

* commit 'c4673b8cfd30300e90729366527d971d1bcbc2a0':
  Cleanup of timeout handling and message