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

This reverts commit 1e44cdfe30a18c0eebec63b9345d90fb29eda875.
Rebase from 'upstream'
Trimmed the branch to only the image_proc sub directory