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

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