Update to AnalyticsSvc - corrects bad merge