Counterpart of https://vanadium-review.googlesource.com/17703
Details in vanadium/issues#739

MultiPart: 4/6
Change-Id: I75062e52f2166b5e67423c6fb27318c9113975f2
3 files changed