Merge "fuzzer: Updates to fuzzer plugin" am: 25e615b9cb
am: 82735c3553

Change-Id: I0678fcfb220e7679bed499738d3bdce0649722f7