Merge "Moves dump one level up for ClockEventController." into tm-qpr-dev