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

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