74cf08b47b
Fixes some build issues (cherry picked from commit 264030d6ecbc7492d884eb328b74399cd722dcb0)
Fixes some build issues (cherry picked from commit 264030d6ecbc7492d884eb328b74399cd722dcb0)