Merge "Add 25ms guard time after sending END_OF_APDU_SESSION" am: 328f34a989
am: 69d613eee9

Change-Id: I150d81ff78d1b09ecb0b795cfc1d2fbf1b7df194