[automerger skipped] Merge changes from topic "sort stats" into pi-dev
am: 664145dcbc  -s ours

Change-Id: Iaf2d41bf8c4464e05f8733d453fcc1a168ef8323
tree: be5bd948a75a0072dc29c9d38d20c5080f6916fa
  1. core/
  2. services/
  3. tests/