Merge "fix an issue where SensorService could request an invalid sensor delay" into ics-mr1