Merge "Use generic mifare reader option as default" am: 3338647f4b am: d6317b6cd9

Change-Id: Ie00c5dec7f29351dab6213fee06ff3e6774d2029