Merge "mtp_fuzzer: Bug fix" into main