Merge "Fix bug when doing signal handler lookup."
am: 9e1514f1d7

Change-Id: Iae0e730a86a4e46d1289e8a91ac2bb7a1a42f677