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

Change-Id: Iee9c974eef13599eebc4dfd82f7fbc5f10e7ca58