Merge "cmd/principal: Counterpart to https://vanadium-review.googlesource.com/#/c/9131/"