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

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