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

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