Genutil proto fixes

[aaronc]

@blushi I did some debugging and made some fixes from running make test-unit-proto against your branch. Some of these fixes would probably have been hard to catch. Some other fixes are depending on #6834 which hopefully gets merged in soon.

---

Before we can merge this PR, please make sure that all the following items have been
checked off. If any of the checklist items are not applicable, please leave them but
write a little note why.

• Targeted PR against correct branch (see CONTRIBUTING.md)
• Linked to Github issue with discussion and accepted design OR link to spec that describes this work.
• Code follows the module structure standards.
• Wrote unit and integration tests
• Updated relevant documentation (docs/) or specification (x/<module>/spec/)
• Added relevant godoc comments.
• Added a relevant changelog entry to the Unreleased section in CHANGELOG.md
• Re-reviewed Files changed in the Github PR explorer
• Review Codecov Report in the comment section below once CI passes

[codecov]

Codecov Report

Merging #6832 into marie/5917-x-genutil will increase coverage by 0.02%.
The diff coverage is 82.05%.

@@                   Coverage Diff                    @@
##           marie/5917-x-genutil    #6832      +/-   ##
========================================================
+ Coverage                 61.47%   61.50%   +0.02%     
========================================================
  Files                       509      510       +1     
  Lines                     31484    31542      +58     
========================================================
+ Hits                      19355    19400      +45     
- Misses                    10628    10637       +9     
- Partials                   1501     1505       +4     

[aaronc]

If this looks good to you @blushi just manually merge this branch into your branch and keep going on #6734. (No need for me to mark it R4R.)