Merge "Ongoing improvements in java fuzz testing"