[Core] Fix compile error after cherry pick