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

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