Merge "repo-review: Fix missing imports"