Merge "fskeyring & userspace reboot: support CE keys" into rvc-dev am: 58d89a355a am: 8968fc0219

Change-Id: I589d3047d3e6766965090988b1cc8b02438093eb