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

* commit '813ce8b7106efc93822261a66b6f428f7ad07203':