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

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