Merge "Harden KeyInfo." into mnc-dev