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

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