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

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