core: Correct the sensors UID

Change-Id: I4e456de6dfa6612caf9dcef751f39e9e478a775e
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0