Merge "Ensure /radio directory exists in recovery"