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

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