Merge "Refresh cardId before using it." am: 84d250c18d
am: 5b3acb8d9b

Change-Id: Ie57153839c499d9972cd6267c4f926525fed1fde