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

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