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

* commit '049b8ab1cae5f420c079905c95a5bdd107404253':
  Avoid logging functions from signal handler.