Merge "Revert^2 "sensors: adding a common convert lib""