[automerger skipped] Merge changes from topic "sort stats" into pi-dev am: 664145dcbc -s ours
am: 0813f8c4ea -s ours
Change-Id: Ifb8171b56932ef6b7c70a0ff36ebacc4ee7801db
This commit is contained in:
am: 0813f8c4ea -s ours
Change-Id: Ifb8171b56932ef6b7c70a0ff36ebacc4ee7801db