Merge "metricsd: Add more assert clause."
am: 8f8ce0c300

* commit '8f8ce0c3002430bfbbbc95eb3c2a97efa1ac8e36':
  metricsd: Add more assert clause.