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

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