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

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