Fix style issues.
Merge topic 'fix-tll-IMPORTED-targets' into next

8fb044e Fix style issues.