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

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