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

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