Merge changes Id0e18bef,Ie2b5f559

* changes:
  Wrap the escrow data with key from keystore
  Load and generate key from keystore in reboot escrow