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

This reverts commit dcabea80c6f0fb50bdc54440a5beabe6c3478d34.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the rotate_recovery sub directory