Merge "Corrected MIFARE default key set" into gingerbread