Merge "fskeyring & userspace reboot: support DE keys" into rvc-dev am: e8c7f09834

Change-Id: I260d865a5f6954647ea9d7835e45d8219b7de6a3