am 99e87a60: am 84de722d: am eab674a8: Merge "Fix missing single-step event"

* commit '99e87a6001e085b7a7cd6fc3d4245a447886032e':