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

Change-Id: Id1089810030a33b92273afd29fd2d9eace9ba684