Merge "Speed up StepIfSignalHandler path." am: c6dd6e8a79 am: df8362bae6 am: fade4fc5c6
am: 73fcac8765

Change-Id: Idba9eba2ecf2a7450ae1e4eb20494e2a9f712853