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

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