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

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