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

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