Merge "Retrieve EID from each card" am: 2f5ad9cb4d am: d34e17143f am: 0988f8cfec

Change-Id: I7867a8a6cc547e139facdfaee172066a4bd977b2