Merge "Fix MTP_TYPE_UINT128 data conversion issue"