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

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