am 3cdccc6f: Merge "fix a typo in SensorService" into jb-mr1-dev

* commit '3cdccc6f852be345c43bdfbc2466aa17c1173c9c':
  fix a typo in SensorService