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

Change-Id: Iad85625eb06b7f413ecf26fcb575f32efbc0ea2d