[1138688] Fix cherry-pick issue that lost necessary import