Merge "new SensorService" into gingerbread