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

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