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

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