am 825477ff: Merge "Add a logging handler on timeout."

* commit '825477ff6bb62bf02654449dc1d9192a23acb81c':
  Add a logging handler on timeout.