Merge "Fix ScopedSignalHandler"
am: 7dbf1a187e

Change-Id: Ic85a20682ecaa109d03827a694efd751e0fb9418