Merge changes from topic "step_event_permission" into qt-dev am: 230171daa7
am: 862079c038

Change-Id: Ic71b6080bb89c64ffa081cd46b1503c3686251e7