Merge "Add EID to 1.3::CardStatus" am: 5ce29fdb29
am: f23927cb6d

Change-Id: I063bb61055c28395a693d6bc35635dc6ae539f44