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

This reverts commit d72a6d400c146d0f26e6cc20be07f1f58a9b2b50.
Rebase from 'upstream'
Trimmed the branch to only the rotate_recovery sub directory