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

* commit 'a5dc52f4bd63525b74a8bf95fd3b3e9fad985d06':
  Fixes 2 race conditions in MetricsLoggerService

Change-Id: I50305867919e7aaff19fe962a2ca19845615a9d7