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

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