am d227679b: (-s ours) am 6b8fd10a: am 300b1a6b: Merge "metricsd: Don\'t crash when some metadata is missing."

* commit 'd227679b352e846d9f4f897585203475eb465e9a':