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

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