Merge changes I763410d4,I665f52c1

* changes:
  Remove unused variable in SensorService code
  Use std::vector in SensorDevice code