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

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