Merge "Fix crash in ApduServiceInfo parsing." into klp-dev