Merge "Fixed vendor specific tlv's payload parser/serializer"