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

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