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

Change-Id: I8e3542d04c42e3d22cd7c2b2ca216c52d3c14cc6