Merge "Fix compiler warnings in sensorservice." into nyc-dev
am: b522871411

* commit 'b52287141164bfb217870c12bc0779ae54b92c19':
  Fix compiler warnings in sensorservice.