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

Change-Id: I66b41a0d3035439f85acc52e98348de0bba56576