Merge "Ongoing improvements in java fuzz testing"
am: ebb5d0f3bc

Change-Id: I93c227e2b33cea9d58647dd97754459be8152422