Merge branch 'stable-2.16'

* stable-2.16:
  Add option to exclude metrics

Change-Id: I40b9b70476c67c4131d626542944ccbbaa4bee21