Merge "Fix build for ag/25776653" into main