Merge "shell_and_utilities_recovery: Fix required dependencies"