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

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