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

* commit '1ab460d222c7b5c6538de558bed465e2006218f2':
  Cleanup of timeout handling and message