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

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