am e52a854a: (-s ours) am 0a423d99: (-s ours) DO NOT MERGE Securely encrypt the master key

* commit 'e52a854a8de88bf3c35de8f9cd25694efd3e4cbd':
  DO NOT MERGE Securely encrypt the master key