Merge changes from topic "step_event_permission" into qt-dev
am: 76d9f44133

Change-Id: I595aac545678b7059c817c62a73ff88a473bf556