Configure the keys actually present on the device
Merge branch 'cm-10.1' into martincz