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

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