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

This reverts commit 098ffacbc45e680b4b64000dbec844e64ddfaec5.
Rebase from 'upstream'
Trimmed the branch to only the force_rotate_recovery sub directory