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

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