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

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