Merge "Bootstrap stats before registering listeners." into ics-mr1