Merge "Harden and clean up KeyProtection." into mnc-dev