Merge "Speed up StepIfSignalHandler path."
am: c6dd6e8a79

Change-Id: Ie0d80840db92a7be958979785b75d3bf4077b030