Merge "BpfUtils.java - add requires T+ annotation" into main