Merge "Fix yamllint for systemmetrics"