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

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