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

Change-Id: I09076401184087f57d4f15b7934abe603b9b85a2