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

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