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

Change-Id: I59593e600d6fbf5b6b4d837ca8cb5e4dfa640b2a