Merge "Make ModifyCardsAtomic 64 bit safe."