Merge "fskeyring & userspace reboot: support CE keys" am: eaa3443ad8 am: 91ba0c8fa4

Change-Id: I393e9464b2579cfd9b59596a70ca8c3881e0582d