am 555aa318: am d0d815f5: am d2402959: Merge "Add Mifare Classic support" am: 1f30c2550e
am: 7c25cad315

Change-Id: I99aeecf78a9e5a8847f523c18ce8132297e39f2f