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

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