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

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