am 68fd9e71: Merge "Sensor.cpp changes." into lmp-dev

* commit '68fd9e71263cb16bbc4de1b5d26fbe4831480c9d':
  Sensor.cpp changes.