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

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