Add missed import while cherry-picking d0beccd