Merge "ServiceManager --> StatsFrameworkInitializer"