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

* commit '7f95fef6708212bcd3dbceefd8f0207df18db365':
  Add a logging handler on timeout.