Merge "Use elf offset in signal step check."