Stats Redesign-core

Change-Id: I672e695a146543cfed7c422129b668c530cca070
Merge "Stats Redesign-core" into R1.10