am 489b4312: am 4c48d2ff: Merge "Make operation counts monotonically increase." into ics-mr1

* commit '489b431273500db81d35ed43440915187c238f92':
  Make operation counts monotonically increase.
tree: 33c8e234355554fa8318d4a6c9e98baba4285485
  1. core/
  2. services/