Merge "Fix the issue on reading cardId." into pi-dev am: af476cbd48
am: 1d08e3d347

Change-Id: Ibccc8ca2b459a4ad769f14b1b167f18d0f88f306