Merge "Use async safe logging in signal handlers." am: fd8fab19df am: 497029004a
am: fc3a649137

Change-Id: I643ae152f2be5c2179df311b93129d9846bcc570