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

Change-Id: Ifb8171b56932ef6b7c70a0ff36ebacc4ee7801db
tree: d4c5330c7544a2ffd79618b355fa29799c749da4
  1. core/
  2. services/
  3. tests/