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

Change-Id: Ib22c3385afcec4b2cd8f2c6154d884a331232615