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

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