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

This reverts commit c3f7be558f03b429b1c30fe22538b8b23071a066.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the rotate_recovery sub directory