Merge "fskeyring & userspace reboot: support CE keys" into rvc-dev