Merge "MTP: add friend class for fuzz testing"