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

Change-Id: Ic19c590b43081d9273977d830b4c33f911930e49