Merge "Fixes 2 race conditions in MetricsLoggerService" into nyc-dev