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

This reverts commit 025633fc42f57b58537d5c8a7242f60b9e4e734a.
Rebase from 'upstream'
Trimmed the branch to only the image_rotate sub directory