Merge "Re-add MTP interface string"