Merge "Fix ScopedSignalHandler" am: 7dbf1a187e am: 1deafe164b
am: 9a29d20486

Change-Id: I0d6f957a8cd0f6feeb2f2ccc89b858bdfa8190cd