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

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