am 64e71a7c: Merge "Avoid logging functions from signal handler."

* commit '64e71a7c2efb5783744335e8df45e5da152a65da':
  Avoid logging functions from signal handler.