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

* commit '4c48d2ff6937e1e3a2fb93cc4cc29324b20542a5':
  Make operation counts monotonically increase.
tree: 8232c65c169f3c4d8e336420274c037b31650987
  1. core/
  2. services/