Merge changes Icee4bf3f,I44029735 into main

* changes:
  apf2java: check-in problematic packet (new logic, with fixes, but without clamping)
  apf2java: check-in problematic packet (new logic with clamping)