am 630a13bd: Merge "Bootstrap stats before registering listeners." into ics-mr1

* commit '630a13bdd88723599a7617ca4df20ab923e7ffbb':
  Bootstrap stats before registering listeners.