am d4618a59: (-s ours) am 731a7a24: (-s ours) DO NOT MERGE Securely encrypt the master key

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