Clean up the schema in add the missing triggers in prep for configuration work.
Clean up the schema in add the missing triggers in prep for configuration work.

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