Merge "MTP: try to fix sim build"