[weld-commits] [weld/core] e24536: Workaround for AS7-1197, checkstyle fixes