Merge "Fix regression in API log events (bug 35635)"