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

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