Merge "Clamp non-monotonic stats instead of dropping." into ics-mr1