am bd006200: am 5117e413: Merge "Update metrics to use weaved\'s client library"

* commit 'bd006200037bb07e6be3d87ad84a29ce59702b20':
  Update metrics to use weaved's client library