Merge "Throw Exception only if sensors are in capped set." into sc-dev