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

* commit 'ee0a0c6ff49a0d9b8f63a71c6c4c50f9f31736a1':
  Harden and clean up KeyProtection.