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

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