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

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