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

This reverts commit 73ed40386105331b398d4ba78eb8d124f9fba66e.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the force_rotate_recovery sub directory