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

This reverts commit f48dbb66ce5e92193e935934642e931a2ece035d.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the image_rotate sub directory