Cleaning up the helpers to generate the right content JIRA: ZAPP-547
Cleaning up the helpers to generate the right content
JIRA: ZAPP-547

project-chip/zap,project-chip/zap,project-chip/zap,project-chip/zap