hltespr: fix nfc (thanks Shareef Ali)
hltespr: this breaks NFC
Merge remote-tracking branch 'upstream/cm-12.0' into cm-12.0