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