Merge "Rename IStatsManager to IStatsd"