Fix reported test-tidy errors for unmerged import blocks
de3547e
This merges import blocks that were reported by tidy as unmerged.
