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

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