Revert "Trimmed the branch to only the image_view sub directory"

This reverts commit ee91c2b73eedf933283b4bc594601c8f08b4b09a.
Rebase from 'upstream'
Trimmed the branch to only the image_view sub directory