Merge "Marks deprecated StatsManager APIs." into pi-dev