Merge "Remove dead code for DataPlanUsageSummary"