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

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