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

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