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

Change-Id: I57a6d090e10a29cbce035db32b319f70298504c9