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

Change-Id: Icbd09c7b3dd2d9b03b18908ab1d987c8d86cb543