Merge "fix a typo in SensorService" into jb-mr1-dev