Merge "[build] Remove unused import" into main