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