Merge change 21134

* changes:
  Add a more compact representation of usage stats.