am 1de64c0a: Merge "Fix crash in ApduServiceInfo parsing." into klp-dev

* commit '1de64c0aa55f74f5b2692dcac3b3350dacda4041':
  Fix crash in ApduServiceInfo parsing.