Merge "Sensor.cpp changes." into lmp-dev