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

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