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

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