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

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