They cannot immediately be consumed by our (ancient, hacked) asn1c toolchain, so we have to massage them into the supported format in follow-up commits. Change-Id: I9fa05d14493889e0a23354938b04a335a117f242
