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

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