Merge "Updated mtp_fuzzer"