Merge "Update error handling for mapInfraActiveRequestToRequest"