TEZ-1435. Fix unused imports. (hitesh)