Merge "Clean up RecoveryController imports"