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

* commit '9710859b5102f36499a628f2931bafd0a6803437':
  Fixes 2 race conditions in MetricsLoggerService

Change-Id: Ic5dcdfe471c9ee37de2a750b70ee0b78fd2bf5da