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

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