Backport build fix
2 files changed