deviceHardwareKeys returns

Change-Id: Ifa3f0b53d4d91074b05a153e0734156462343ba9
Fix NFC

Change-Id: I338ffc5f10ba86cdd81fc42780043b7364b840e3
Merge changes I338ffc5f,Ifa3f0b53 into cm-12.0

* changes:
  Fix NFC
  deviceHardwareKeys returns