Merge branch '2019-08-20-ti-imports'

- More DaVinci cleanups
- Other minor omap2plus cleanups