Fix a compile error caused by the cherry picks.