Merge "SensorService now always clamps the requested rate" into ics-mr1