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

Change-Id: Ia57e7be2e91e783e415ea8f0289a5414881f8378