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

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