Fix compile error due to cherry-pick