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

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