am ec8f11da: Merge "NFC Tap&Pay: deal with changes from API review." into klp-dev

* commit 'ec8f11da8fb7b5f698e2861311e1291f6f5770f9':
  NFC Tap&Pay: deal with changes from API review.