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

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