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

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