20200503 city.surat: Ensure return of stranded Gujaratis: Vijay Rupani