Fix problem finding if in a signal handler.
am: 1b47da733e

Change-Id: I39329e0ba582b8f949c4743385a8534b27ca7b4b