Merge "Fix race condition in MetricsLoggerService" into nyc-dev