Stats Redesign and exposing stats

Change-Id: Ia5e5235affc4bbeb2647c58a35bb972bdddb4fcc
Merge "Stats Redesign and exposing stats"