Revert "Revert "core: Correct the sensors UID""

This reverts commit 01186241073f75fe408678db25e3ef7086aa72c3.

Change-Id: I33534e0235c58701b8404129413d833ae2a1982a
Merge "Revert "Revert "core: Correct the sensors UID""" into kitkat