fix build error from cherry-pick