Merge "Fix the null cardId issue when card is null." into pi-dev am: 516a779a0c
am: 4dd3c00975

Change-Id: Ibcec0e93656a48b9348d745b4a82ce2fc419a821