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

Change-Id: I9ea0ed854f55311b12500548a1b203a7cc850c07