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

Change-Id: I0d4b275480a9fe21511a61345d0cdba23e17f86c