Merge "Update error handling in BpfNetMaps"