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

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