[automerger skipped] Merge "Fix bug when doing signal handler lookup." into pi-dev
am: 1ddef8852a  -s ours

Change-Id: I62382ee276436975d61883e1e21ef3a566b1ce8e