Merge branch 'stable-2.15' into stable-2.16 * stable-2.15: Add option to exclude metrics Change-Id: I54c39fbff22495155aa48daeb4e518c6f817aea8