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

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