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

Change-Id: Ie40e77a28100eddb12a85cc8bcd31f169f317805