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

* commit 'b65e80e534c8e0ca1f2008960ae435594a608e32':
  metricsd: Add more assert clause.