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

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