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

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