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

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