Merge "fskeyring & userspace reboot: support DE keys" am: 3b719ed32e am: ac589ee784

Change-Id: I50a54e3ac6a873930d2c3b0ee62ca389100b0787