Merge "Remove some hardcoded cases of kCardShift"