Merge "Add 25ms guard time after sending END_OF_APDU_SESSION" am: 328f34a9 am: 69d613ee am: f97b0ec0 am: 5d1a45c2 Change-Id: I7ca8059608c8c04308a6d2c8c341d843726385f3