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

* commit '33e3710aafb68125f05ab30d61e324c894f0a3bb':
  Bootstrap stats before registering listeners.