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

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