Merge "Fix fuzzer so it doesn't add overlapping maps."