Merge "Optimize eSE CTS test applet" am: cce210bf89
am: 3babae0a32

Change-Id: Ia17abbd97a92543b5be571d963f845048c1de562