Merge "Merge "Use EventLogTags for logging" into main am: a362fe4662 am: b6768d0c61" into main