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

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