Merge "servicemanager: make recovery_available."