Merge "DO NOT MERGE: Downbranch merge conflict [Output Switcher] Log new events" into tm-dev