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

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