am 35738049: am 8d9bb1ae: Merge "Fix up Tap and Pay how it works." into mnc-dev

* commit '35738049df5aa6b14ef0721375cf40c5e7c60539':
  Fix up Tap and Pay how it works.