Merge "Revert "Add missing card mark verification to CC""
am: d3cb7fae3a

Change-Id: I4b93f8470b1274e6b1d8132c278da390ce52f55f