Merge "Merge "Update comments to point to the new location of event.logtags." into main am: ff2415b7a9 am: 858dc7c54d" into main