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

Change-Id: I4e76b1b61e9d99d05c48f4a44422092272ef00c0