Address leftover review comments from PR#1712 (#1889)
Address leftover review comments from PR#1712 (#1889)

* Address leftover review comments from PR#1712

* Restyled by clang-format

Co-authored-by: Restyled.io <eb8d3fd3977bb570908ffc25e24391520747defb@restyled.io>
nestlabs/connectedhomeip,nestlabs/connectedhomeip,project-chip/connectedhomeip,project-chip/connectedhomeip,project-chip/connectedhomeip,nestlabs/connectedhomeip,nestlabs/connectedhomeip,nestlabs/connectedhomeip,nestlabs/connectedhomeip,project-chip/connectedhomeip,project-chip/connectedhomeip,nestlabs/connectedhomeip,project-chip/connectedhomeip