Merge changes Idbb3e029,I8b6136dc,I4c2bb1d8

* changes:
  Encrypt keys even when device locked
  Symmetric keyguard-bound superencryption
  ECDH encryption module