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

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