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

* commit '9b7f9c4b005b174f24c3254cbaf7884d913d6ba6':
  Add a logging handler on timeout.