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

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