Revert "Revert "PEEK: Sensors improvements""

This reverts commit 588f8351ad3dee3ddd7ac49959e80a768e83a4a6.

Change-Id: I83c62a8bd8bb4a6385faf2b540e20e3994074d76