card emulation patch port to JB

Change-Id: I73fe9aa30830951ea5b9d44e9a9bf83cb720e567