Revert "Securely encrypt the master key"

This reverts commit 7053e9cd5ebbbb783bf4140381090e6bd0caa740.

Change-Id: I77ed4dbdff8643c80629d2126cb29f85c24c7b43
6 files changed