Merge "Fixing CBOR parsing/serialization for prod keys."