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

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