Merge branch 'stable-2.16' * stable-2.16: Add option to exclude metrics Change-Id: Iaa224d3e84e6ddc9ffb14ed1945f34fbdfdaf7ba