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

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