Fix compile error caused by cherry-pick